diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-25 14:25:58 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-06-25 14:25:58 +0100 |
| commit | 4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2 (patch) | |
| tree | bb0b815513dc9a0b5562c9795d725557a845e9d0 /pkgs/build-support | |
| parent | 893ab31159486b260e0ede4ab876ea9cdf935fbc (diff) | |
| download | nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.gz nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.bz2 nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.lz nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.xz nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.zst nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.zip | |
Revert "stdenv: introduce baseHash() to replace stripHash()"
Introduced by mistake This reverts commit e71a5cb87841f0af4a2279517b77a9a07ba394c0.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3753668bcbfb..82cb72cb67ea 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -531,7 +531,8 @@ rec { # Hacky: RPM looks for <basename>.spec inside the tarball, so # strip off the hash. - srcName=$(baseHash "$src") + stripHash "$src" + srcName="$strippedName" cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root export HOME=/tmp/home |