diff options
| author | Shea Levy <shea@shealevy.com> | 2015-11-16 05:42:27 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-11-16 05:42:27 -0500 |
| commit | afaf712ee7a61150934978085208b9803a36f5d9 (patch) | |
| tree | 1fa71f659818af8ffbbecff06781f81a36ed7d34 /pkgs/build-support/replace-dependency.nix | |
| parent | 782cfe94b09914fbd2f62a26f19db3ebdc6701ca (diff) | |
replace-dependency.nix: Use dynamic attrs now.
Diffstat (limited to 'pkgs/build-support/replace-dependency.nix')
| -rw-r--r-- | pkgs/build-support/replace-dependency.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 4138397f795f8..1a1c1a113ea2d 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -48,7 +48,7 @@ let oldStorepath = builtins.storePath (discard (toString oldDependency)); - referencesOf = drv: getAttr (discard (toString drv)) references; + referencesOf = drv: references.${discard (toString drv)}; dependsOnOldMemo = listToAttrs (map (drv: { name = discard (toString drv); @@ -56,7 +56,7 @@ let any dependsOnOld (referencesOf drv); }) (builtins.attrNames references)); - dependsOnOld = drv: getAttr (discard (toString drv)) dependsOnOldMemo; + dependsOnOld = drv: dependsOnOldMemo.${discard (toString drv)}; drvName = drv: discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); @@ -78,7 +78,6 @@ let }) (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps; + attr = discard (toString drv); in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); -if hasAttr (discard (toString drv)) rewriteMemo -then getAttr (discard (toString drv)) rewriteMemo -else warn "replace-dependency.nix: derivation ${discard (toString drv)} does not depend on ${discard (toString oldDependency)}\n" drv +rewriteMemo.${attr} or (warn "replace-dependency.nix: Derivation ${attr} does not depend on ${discard (toString oldDependency)}\n" drv) |