treewide: fix types for mkDerivation params

This commit is contained in:
Robin Gloster
2019-12-31 01:23:19 +01:00
committed by Jan Tojnar
parent 81ffabdf4f
commit 006242fd5a
18 changed files with 90 additions and 98 deletions
+1 -1
View File
@@ -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";
+7 -7
View File
@@ -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
'';