Revert "stdenv: introduce baseHash() to replace stripHash()"

Introduced by mistake This reverts commit e71a5cb878.
2016-06-25 14:25:58 +01:00
parent 893ab31159
commit 4f5918cd2e
12 changed files with 36 additions and 45 deletions
--- 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
  '';

--- 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