* Refactoring: Get rid of a few subdirectories in corepkgs/, and some

  other simplifications.
* Use <nix/...> to locate the corepkgs.  This allows them to be
  overriden through $NIX_PATH.
* Use bash's pipefail option in the NAR builder so that we don't need
  to create a temporary file.

1 files changed, 1 insertions, 4 deletions

diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index cf46d00df..cb7a478ba 100755
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -20,9 +20,6 @@ $curl = "$curl $extraCurlFlags" if defined $extraCurlFlags;
 
 my $binDir = $ENV{"NIX_BIN_DIR"} || "@bindir@";
 
-my $dataDir = $ENV{"NIX_DATA_DIR"};
-$dataDir = "@datadir@" unless defined $dataDir;
-
 
 # Parse the command line.
 my $localCopy;
@@ -107,7 +104,7 @@ foreach my $storePath (@storePaths) {
 
     # Construct a Nix expression that creates a Nix archive.
     my $nixexpr = 
-        "((import $dataDir/nix/corepkgs/nar/nar.nix) " .
+        "(import <nix/nar.nix> " .
         "{ storePath = builtins.storePath \"$storePath\"; system = \"@system@\"; hashAlgo = \"$hashAlgo\"; }) ";
     
     print NIX $nixexpr;