diff options
author | Nikolay Amiantov <ab@fmap.me> | 2015-02-19 23:50:42 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2015-02-19 23:50:42 +0300 |
commit | 88ab59eb736220a57bdf2efa98ec70220f60d57a (patch) | |
tree | dcf41e19b4e4f13a53b47612dc22023578c06503 /pkgs/development/r-modules | |
parent | 0f9c0348af199f9baed6585be0502ad61c6f7e04 (diff) | |
download | nixlib-88ab59eb736220a57bdf2efa98ec70220f60d57a.tar nixlib-88ab59eb736220a57bdf2efa98ec70220f60d57a.tar.gz nixlib-88ab59eb736220a57bdf2efa98ec70220f60d57a.tar.bz2 nixlib-88ab59eb736220a57bdf2efa98ec70220f60d57a.tar.lz nixlib-88ab59eb736220a57bdf2efa98ec70220f60d57a.tar.xz nixlib-88ab59eb736220a57bdf2efa98ec70220f60d57a.tar.zst nixlib-88ab59eb736220a57bdf2efa98ec70220f60d57a.zip |
rPackages: nicer override* functions
Diffstat (limited to 'pkgs/development/r-modules')
-rw-r--r-- | pkgs/development/r-modules/default.nix | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 1d23bb692cf1..dce680b10560 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -51,17 +51,11 @@ let # }); # } overrideNativeBuildInputs = overrides: old: - let - attrNames = builtins.attrNames overrides; - nameValuePairs = map (name: rec { - inherit name; - nativeBuildInputs = builtins.getAttr name overrides; - value = (builtins.getAttr name old).overrideDerivation (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ nativeBuildInputs; - }); - }) attrNames; - in - builtins.listToAttrs nameValuePairs; + lib.mapAttrs (name: value: + (builtins.getAttr name old).overrideDerivation (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ value; + }) + ) overrides; # Overrides package definitions with buildInputs. # For example, @@ -78,17 +72,11 @@ let # }); # } overrideBuildInputs = overrides: old: - let - attrNames = builtins.attrNames overrides; - nameValuePairs = map (name: rec { - inherit name; - buildInputs = builtins.getAttr name overrides; - value = (builtins.getAttr name old).overrideDerivation (attrs: { - buildInputs = attrs.buildInputs ++ buildInputs; - }); - }) attrNames; - in - builtins.listToAttrs nameValuePairs; + lib.mapAttrs (name: value: + (builtins.getAttr name old).overrideDerivation (attrs: { + buildInputs = attrs.buildInputs ++ value; + }) + ) overrides; # Overrides package definition requiring X running to install. # For example, |