From 4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 25 Jun 2016 14:25:58 +0100
Subject: Revert "stdenv: introduce baseHash() to replace stripHash()"

Introduced by mistake

This reverts commit e71a5cb87841f0af4a2279517b77a9a07ba394c0.
---
 nixos/modules/services/networking/ircd-hybrid/builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nixos')

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