diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-03-11T15·27+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2005-03-11T15·27+0000 |
| commit | 536f3241775c21566d68a0581c78154a908da35f (patch) | |
| tree | bb8fe1802a26963477ca427cce79ef349183841c | |
| parent | 08df4436182a12a25aa45fcab2a13dbe71f7f10a (diff) | |
* nix-install-package: install outPath, not drvPath, for now.
* nix-prefecth-url: print out in base-16.
| -rw-r--r-- | scripts/nix-install-package.in | 3 | ||||
| -rw-r--r-- | scripts/nix-prefetch-url.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/nix-install-package.in b/scripts/nix-install-package.in index 4dc241ab76c0..f067af43d996 100644 --- a/scripts/nix-install-package.in +++ b/scripts/nix-install-package.in @@ -11,6 +11,7 @@ die unless defined $pkgFile; # from a web browser, the user gets to see us. if (!defined $ENV{"NIX_HAVE_TERMINAL"}) { $ENV{"NIX_HAVE_TERMINAL"} = "1"; + $ENV{"LD_LIBRARY_PATH"} = ""; exec("xterm", "-e", "@shell@", "-c", "@bindir@/nix-install-package '$pkgFile' || read"); die "cannot execute `xterm'"; } @@ -43,7 +44,7 @@ system "@bindir@/nix-pull '$manifestURL'"; die if $? != 0; print "\nInstalling package...\n"; -system "@bindir@/nix-env -i '$drvPath'"; +system "@bindir@/nix-env -i '$outPath'"; die if $? != 0; print "\nInstallation succeeded! Press Enter to continue.\n"; diff --git a/scripts/nix-prefetch-url.in b/scripts/nix-prefetch-url.in index ed3ad87e49f3..23cc617ca45a 100644 --- a/scripts/nix-prefetch-url.in +++ b/scripts/nix-prefetch-url.in @@ -32,7 +32,7 @@ if test -z "$hash"; then @curl@ --fail --location --max-redirs 20 "$url" > $tmpPath1 # Compute the hash. - hash=$(@bindir@/nix-hash --base32 --type "$hashType" --flat $tmpPath1) + hash=$(@bindir@/nix-hash --type "$hashType" --flat $tmpPath1) if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi # Rename it so that the fetchurl builder can find it. |