diff options
author | Russell O'Connor <oconnorr@google.com> | 2015-11-16 17:44:03 -0500 |
---|---|---|
committer | Russell O'Connor <roconnor@theorem.ca> | 2015-11-16 17:44:03 -0500 |
commit | 94e68bf9ee7335e0e36d993b10fe096ac04de809 (patch) | |
tree | 05830d279b8b4bdb87f43343cd281fba856e9147 /pkgs/build-support/replace-dependency.nix | |
parent | afaf712ee7a61150934978085208b9803a36f5d9 (diff) | |
download | nixpkgs-94e68bf9ee7335e0e36d993b10fe096ac04de809.tar nixpkgs-94e68bf9ee7335e0e36d993b10fe096ac04de809.tar.gz nixpkgs-94e68bf9ee7335e0e36d993b10fe096ac04de809.tar.bz2 nixpkgs-94e68bf9ee7335e0e36d993b10fe096ac04de809.tar.lz nixpkgs-94e68bf9ee7335e0e36d993b10fe096ac04de809.tar.xz nixpkgs-94e68bf9ee7335e0e36d993b10fe096ac04de809.tar.zst nixpkgs-94e68bf9ee7335e0e36d993b10fe096ac04de809.zip |
replace-dependency.nix: Give attr a slightly more meaningful name of drvHash
Diffstat (limited to 'pkgs/build-support/replace-dependency.nix')
-rw-r--r-- | pkgs/build-support/replace-dependency.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 1a1c1a113ea..c8794c6eea1 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -78,6 +78,6 @@ let }) (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps; - attr = discard (toString drv); + drvHash = discard (toString drv); in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); -rewriteMemo.${attr} or (warn "replace-dependency.nix: Derivation ${attr} does not depend on ${discard (toString oldDependency)}\n" drv) +rewriteMemo.${drvHash} or (warn "replace-dependency.nix: Derivation ${drvHash} does not depend on ${discard (toString oldDependency)}\n" drv) |