diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-23 11:53:45 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-06-25 14:20:56 +0100 |
| commit | e71a5cb87841f0af4a2279517b77a9a07ba394c0 (patch) | |
| tree | c233b5bc126f79effc16d5b9ac60bfa3f1c1ea64 /pkgs/data | |
| parent | 7060eaf0bb98f3b4b6d10e7e55d20df9527866bf (diff) | |
| download | nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.gz nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.bz2 nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.lz nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.xz nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.zst nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.zip | |
stdenv: introduce baseHash() to replace stripHash()
stripHash uses a global variable to communicate it's computation results, but it's not necessary. You can just pipe to stdout in a subshell. A function mostly behaves like just another command. baseHash() also introduces a suffix-stripping capability since it's something the users of the function tend to use.
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, 2 insertions, 3 deletions
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index 784dfe710078..f78c8240809b 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=$(basename $(stripHash $curSrc; echo $strippedName)) + ttfName=$(baseHash $curSrc) 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 70fd729297c0..5504c9f3299c 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,5 +3,4 @@ source $stdenv/setup mkdir -p $out/xml/dtd/docbook-ebnf cd $out/xml/dtd/docbook-ebnf cp -p $dtd dbebnf.dtd -stripHash $catalog -cp -p $catalog $strippedName +cp -p $catalog $(baseHash $catalog) |