civodul pushed a commit to tag 1.8
in repository guix.
commit 9dd54bc7bbc404e8e4513b712e0af9ac5b4439bd
Author: Shell Turner <[email protected]>
Date: Tue Sep 16 18:05:00 2014 +0100
Pass through --set from nix-install-package command line to nix-env
---
scripts/nix-install-package.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/scripts/nix-install-package.in b/scripts/nix-install-package.in
index 23f6efb..c109652 100755
--- a/scripts/nix-install-package.in
+++ b/scripts/nix-install-package.in
@@ -15,6 +15,7 @@ my $source;
my $fromURL = 0;
my @extraNixEnvArgs = ();
my $interactive = 1;
+my $op = "--install";
while (scalar @args) {
my $arg = shift @args;
@@ -29,6 +30,9 @@ while (scalar @args) {
die "$0: ‘--profile’ requires an argument\n" if !defined $profile;
push @extraNixEnvArgs, "-p", $profile;
}
+ elsif ($arg eq "--set") {
+ $op = "--set";
+ }
elsif ($arg eq "--non-interactive") {
$interactive = 0;
}
@@ -129,7 +133,7 @@ if (defined $binaryCacheURL) {
print "\nInstalling package...\n";
-system("$Nix::Config::binDir/nix-env", "--install", $outPath, "--force-name",
$drvName, @extraNixEnvArgs) == 0
+system("$Nix::Config::binDir/nix-env", $op, $outPath, "--force-name",
$drvName, @extraNixEnvArgs) == 0
or barf "nix-env failed: $?";