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/data | |
| 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/data')
| -rw-r--r-- | pkgs/data/fonts/droid/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index f78c8240809b..784dfe710078 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(baseHash $curSrc) + ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh index 5504c9f3299c..70fd729297c0 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh @@ -3,4 +3,5 @@ source $stdenv/setup mkdir -p $out/xml/dtd/docbook-ebnf cd $out/xml/dtd/docbook-ebnf cp -p $dtd dbebnf.dtd -cp -p $catalog $(baseHash $catalog) +stripHash $catalog +cp -p $catalog $strippedName |