diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-01-25 12:47:17 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-01-26 21:01:06 -0600 |
commit | c6f1c754720b271d9625a657e1f519bd6c3dde6a (patch) | |
tree | 5c35ec529577218518380688d6716fadeef12cbc /pkgs/build-support | |
parent | dfe1dc0c02dc5445fb002cb63e7310c4d56953bb (diff) | |
download | nixlib-c6f1c754720b271d9625a657e1f519bd6c3dde6a.tar nixlib-c6f1c754720b271d9625a657e1f519bd6c3dde6a.tar.gz nixlib-c6f1c754720b271d9625a657e1f519bd6c3dde6a.tar.bz2 nixlib-c6f1c754720b271d9625a657e1f519bd6c3dde6a.tar.lz nixlib-c6f1c754720b271d9625a657e1f519bd6c3dde6a.tar.xz nixlib-c6f1c754720b271d9625a657e1f519bd6c3dde6a.tar.zst nixlib-c6f1c754720b271d9625a657e1f519bd6c3dde6a.zip |
kdeApps: update to 14.12.1
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/autonix/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix index cc3b1bb259b2..ec4a2beb4d01 100644 --- a/pkgs/build-support/autonix/default.nix +++ b/pkgs/build-support/autonix/default.nix @@ -48,6 +48,7 @@ let , mkDerivation ? mkDerivation , preResolve ? id # modify package set before dependency resolution , postResolve ? id # modify package set after dependency resolution + , renames ? {} , scope ? {} }: let @@ -61,7 +62,10 @@ let derive = mapAttrs (name: mkDerivation); - packages = importPackages dir { inherit mirror; }; + renames_ = + if renames == {} then (import (dir + "/renames.nix") {}) else renames; + + packages = importPackages dir renames_ { inherit mirror; }; in derive (postResolve (resolve (preResolve packages))); @@ -112,7 +116,7 @@ let in fold (f: x: f x) orig [ withNames bestVersions ]; - importPackages = path: manifestScope: + importPackages = path: renames: manifestScope: let # Do not allow any package to depend on itself. @@ -124,8 +128,6 @@ let else id); in mapAttrs removeSelfDep; - renames = import (path + "/renames.nix") {}; - renamed = dep: renames."${dep}" or dep; manifest = importManifest (path + "/manifest.nix") manifestScope; |