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

rPackages: nicer override* functions

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-02-19 23:50:42 +03:00
parent 0f9c0348af
commit 88ab59eb73
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/r-modules/default.nix
View File

@ -51,17 +51,11 @@ let
# }); # });
# } # }
overrideNativeBuildInputs = overrides: old: overrideNativeBuildInputs = overrides: old:
let lib.mapAttrs (name: value:
attrNames = builtins.attrNames overrides; (builtins.getAttr name old).overrideDerivation (attrs: {
nameValuePairs = map (name: rec { nativeBuildInputs = attrs.nativeBuildInputs ++ value;
inherit name; })
nativeBuildInputs = builtins.getAttr name overrides; ) overrides;
value = (builtins.getAttr name old).overrideDerivation (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ nativeBuildInputs;
});
}) attrNames;
in
builtins.listToAttrs nameValuePairs;
# Overrides package definitions with buildInputs. # Overrides package definitions with buildInputs.
# For example, # For example,
@ -78,17 +72,11 @@ let
# }); # });
# } # }
overrideBuildInputs = overrides: old: overrideBuildInputs = overrides: old:
let lib.mapAttrs (name: value:
attrNames = builtins.attrNames overrides; (builtins.getAttr name old).overrideDerivation (attrs: {
nameValuePairs = map (name: rec { buildInputs = attrs.buildInputs ++ value;
inherit name; })
buildInputs = builtins.getAttr name overrides; ) overrides;
value = (builtins.getAttr name old).overrideDerivation (attrs: {
buildInputs = attrs.buildInputs ++ buildInputs;
});
}) attrNames;
in
builtins.listToAttrs nameValuePairs;
# Overrides package definition requiring X running to install. # Overrides package definition requiring X running to install.
# For example, # For example,