diff options
| -rwxr-xr-x | scripts/nix-populate | 58 | ||||
| -rw-r--r-- | src/nix.cc | 2 |
2 files changed, 0 insertions, 60 deletions
diff --git a/scripts/nix-populate b/scripts/nix-populate deleted file mode 100755 index d375caa7d3d0..000000000000 --- a/scripts/nix-populate +++ /dev/null @@ -1,58 +0,0 @@ -#! /usr/bin/perl -w - -use strict; -use Cwd; - -my $selfdir = cwd; - -my @dirs = ("bin", "sbin", "lib", "include"); - -# Create the subdirectories. -mkdir $selfdir; -foreach my $dir (@dirs) { - mkdir "$selfdir/$dir"; -} - -# For each activated package, create symlinks. - -sub createLinks { - my $srcdir = shift; - my $dstdir = shift; - - my @srcfiles = glob("$srcdir/*"); - - foreach my $srcfile (@srcfiles) { - my $basename = $srcfile; - $basename =~ s/^.*\///g; # strip directory - my $dstfile = "$dstdir/$basename"; - if (-d $srcfile) { - # !!! hack for resolving name clashes - if (!-e $dstfile) { - mkdir($dstfile) or - die "error creating directory $dstfile"; - } - -d $dstfile or die "$dstfile is not a directory"; - createLinks($srcfile, $dstfile); - } elsif (-l $dstfile) { - my $target = readlink($dstfile); - die "collission between $srcfile and $target"; - } else { - print "linking $dstfile to $srcfile\n"; - symlink($srcfile, $dstfile) or - die "error creating link $dstfile"; - } - } -} - -foreach my $name (keys %ENV) { - - next unless ($name =~ /^act.*$/); - - my $pkgdir = $ENV{$name}; - - print "merging $pkgdir\n"; - - foreach my $dir (@dirs) { - createLinks("$pkgdir/$dir", "$selfdir/$dir"); - } -} diff --git a/src/nix.cc b/src/nix.cc index 5904bf82d519..d068e9616f94 100644 --- a/src/nix.cc +++ b/src/nix.cc @@ -267,8 +267,6 @@ void installPkg(string hash) _exit(0); } - throw Error("no prebuilt available"); - build: /* Fill in the environment. We don't bother freeing the |