mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nix-install-package: install outPath, not drvPath, for now.

Browse source 
* nix-prefecth-url: print out in base-16.
This commit is contained in:
Eelco Dolstra 2005-03-11 15:27:37 +00:00
parent 08df443618
commit 536f324177
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/nix-install-package.in
View file

@ -11,6 +11,7 @@ die unless defined $pkgFile;
# from a web browser, the user gets to see us. # from a web browser, the user gets to see us.
if (!defined $ENV{"NIX_HAVE_TERMINAL"}) { if (!defined $ENV{"NIX_HAVE_TERMINAL"}) {
$ENV{"NIX_HAVE_TERMINAL"} = "1"; $ENV{"NIX_HAVE_TERMINAL"} = "1";
$ENV{"LD_LIBRARY_PATH"} = "";
exec("xterm", "-e", "@shell@", "-c", "@bindir@/nix-install-package '$pkgFile' || read"); exec("xterm", "-e", "@shell@", "-c", "@bindir@/nix-install-package '$pkgFile' || read");
die "cannot execute `xterm'"; die "cannot execute `xterm'";
} }
@ -43,7 +44,7 @@ system "@bindir@/nix-pull '$manifestURL'";
die if $? != 0; die if $? != 0;
print "\nInstalling package...\n"; print "\nInstalling package...\n";
system "@bindir@/nix-env -i '$drvPath'"; system "@bindir@/nix-env -i '$outPath'";
die if $? != 0; die if $? != 0;
print "\nInstallation succeeded! Press Enter to continue.\n"; print "\nInstallation succeeded! Press Enter to continue.\n";

2
scripts/nix-prefetch-url.in
View file

@ -32,7 +32,7 @@ if test -z "$hash"; then
@curl@ --fail --location --max-redirs 20 "$url" > $tmpPath1 @curl@ --fail --location --max-redirs 20 "$url" > $tmpPath1
# Compute the hash. # 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 if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
# Rename it so that the fetchurl builder can find it. # Rename it so that the fetchurl builder can find it.