public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename patches -> overrides

Browse Source
This commit is contained in:
Moritz Ulrich 2014-10-09 22:01:21 +02:00
parent 172e55c7fc
commit 6157cc0c29
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/chicken/eggDerivation.nix
View File

@ -7,12 +7,12 @@
let let
libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/"; libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
patches = import ./patches.nix; overrides = import ./overrides.nix;
lib = stdenv.lib; lib = stdenv.lib;
baseName = (builtins.parseDrvName name).name; baseName = (builtins.parseDrvName name).name;
patch = if builtins.hasAttr baseName patches override = if builtins.hasAttr baseName overrides
then then
builtins.getAttr baseName patches builtins.getAttr baseName overrides
else else
{}; {};
in in
@ -45,4 +45,4 @@ stdenv.mkDerivation ({
--prefix PATH : "$out/bin:$CHICKEN_REPOSITORY_EXTRA:$CHICKEN_REPOSITORY" --prefix PATH : "$out/bin:$CHICKEN_REPOSITORY_EXTRA:$CHICKEN_REPOSITORY"
done done
''; '';
} // (builtins.removeAttrs args ["name" "buildInputs"]) // patch) } // (builtins.removeAttrs args ["name" "buildInputs"]) // override)

0
pkgs/development/compilers/chicken/patches.nix → pkgs/development/compilers/chicken/overrides.nix
View File