summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2016-06-25 14:25:58 +0100
committerzimbatm <zimbatm@zimbatm.com>2016-06-25 14:25:58 +0100
commit4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2 (patch)
treebb0b815513dc9a0b5562c9795d725557a845e9d0 /nixos
parent893ab31159486b260e0ede4ab876ea9cdf935fbc (diff)
downloadnixlib-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 'nixos')
-rw-r--r--nixos/modules/services/networking/ircd-hybrid/builder.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh
index 489aa1ca9fbe..f2c92878a4dc 100644
--- a/nixos/modules/services/networking/ircd-hybrid/builder.sh
+++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh
@@ -12,7 +12,7 @@ for i in $scripts; do
     if test "$(echo $i | cut -c1-2)" = "=>"; then
         subDir=$(echo $i | cut -c3-)
     else
-        dst=$out/$subDir/$(baseHash $i | sed 's/\.in//')
+        dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//')
         doSub $i $dst
         chmod +x $dst # !!!
     fi
@@ -23,7 +23,7 @@ for i in $substFiles; do
     if test "$(echo $i | cut -c1-2)" = "=>"; then
         subDir=$(echo $i | cut -c3-)
     else
-        dst=$out/$subDir/$(baseHash $i | sed 's/\.in//')
+        dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//')
         doSub $i $dst
     fi
 done