diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-10 02:13:39 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:23:19 +0100 |
| commit | 006242fd5ac679889ff3f9bc074ffad95a43041f (patch) | |
| tree | 478bcb5f952dc4f87a00f1a3e4fa345481fc8c52 /pkgs/tools/text | |
| parent | 81ffabdf4f228732607796fc3c58148c8d62affe (diff) | |
| download | nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.gz nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.bz2 nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.lz nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.xz nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.tar.zst nixpkgs-006242fd5ac679889ff3f9bc074ffad95a43041f.zip | |
treewide: fix types for mkDerivation params
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/mdcat/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/reckon/default.nix | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 4139771b5cb..626963bc601 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ (stdenv.lib.optional stdenv.isDarwin Security) openssl ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; cargoSha256 = "1hxsfls6fpllc9yg5ib3qz6pa62j1y1va8a6356j6812csk4ifnn"; diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 25e9c07f351..261149229b6 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { pname = "reckon"; version = (import ./gemset.nix).reckon.version; - env = bundlerEnv { - name = "${pname}-${version}-gems"; - - gemdir = ./.; - }; - phases = [ "installPhase" ]; buildInputs = [ makeWrapper ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/reckon $out/bin/reckon ''; |