public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildNodePackage: fix strippedName usage

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-10-15 18:44:54 +03:00
parent d91365d714
commit 10447c6900
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/node-packages/node-env.nix
View File

@ -121,7 +121,7 @@ let
if [ -f "${src}" ] if [ -f "${src}" ]
then then
# Figure out what directory has been unpacked # Figure out what directory has been unpacked
packageDir=$(find . -type d -maxdepth 1 | tail -1) packageDir="$(find . -type d -maxdepth 1 | tail -1)"
# Restore write permissions to make building work # Restore write permissions to make building work
find "$packageDir" -type d -print0 | xargs -0 chmod u+x find "$packageDir" -type d -print0 | xargs -0 chmod u+x
@ -131,6 +131,8 @@ let
mv "$packageDir" "$DIR/${packageName}" mv "$packageDir" "$DIR/${packageName}"
elif [ -d "${src}" ] elif [ -d "${src}" ]
then then
strippedName="$(stripHash ${src})"
# Restore write permissions to make building work # Restore write permissions to make building work
chmod -R u+w $strippedName chmod -R u+w $strippedName
@ -138,9 +140,6 @@ let
mv $strippedName "$DIR/${packageName}" mv $strippedName "$DIR/${packageName}"
fi fi
# Unset the stripped name to not confuse the next unpack step
unset strippedName
# Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store. # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
# The following JavaScript replaces these by * to prevent that # The following JavaScript replaces these by * to prevent that
cd "$DIR/${packageName}" cd "$DIR/${packageName}"