* Move the substitution functions into stdenv (not merged yet).

* If the environment variable buildCommand is set, then eval that
  instead of doing the build phases.  This is used by the runCommand
  function in all-packages.nix to allow one-lines like

    foo = runCommand "foo" {} "mkdir $out; echo foo > $out/foo";
    

svn path=/nixpkgs/trunk/; revision=7298

3 files changed, 16 insertions, 24 deletions

diff --git a/pkgs/build-support/substitute/generic-substituter.sh b/pkgs/build-support/substitute/generic-substituter.sh
deleted file mode 100644
index 51db11bfa79..00000000000
--- a/pkgs/build-support/substitute/generic-substituter.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-source $stdenv/setup
-source $substitute
-
-args=
-
-target=$out
-if test -n "$dir"; then
-    target=$out/$dir/$name
-    ensureDir $out/$dir
-fi
-
-# Select all environment variables that start with a lowercase character.
-for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do
-    echo "$envVar -> ${!envVar}"
-    args="$args --subst-var $envVar"
-done
-
-substitute $src $target $args
-
-if test -n "$isExecutable"; then
-    chmod +x $target
-fi
diff --git a/pkgs/build-support/substitute/generic-substituter.nix b/pkgs/build-support/substitute/substitute-all.nix
index acc349ac816..6c0f970a392 100644
--- a/pkgs/build-support/substitute/generic-substituter.nix
+++ b/pkgs/build-support/substitute/substitute-all.nix
@@ -4,7 +4,6 @@ args:
 
 stdenv.mkDerivation ({
   name = if args ? name then args.name else baseNameOf (toString args.src);
-  builder = ./generic-substituter.sh;
-  substitute = ./substitute.sh;
+  builder = ./substitute-all.sh;
   inherit (args) src;
 } // args)
diff --git a/pkgs/build-support/substitute/substitute-all.sh b/pkgs/build-support/substitute/substitute-all.sh
new file mode 100644
index 00000000000..3d3999ad520
--- /dev/null
+++ b/pkgs/build-support/substitute/substitute-all.sh
@@ -0,0 +1,15 @@
+source $stdenv/setup
+
+args=
+
+target=$out
+if test -n "$dir"; then
+    target=$out/$dir/$name
+    ensureDir $out/$dir
+fi
+
+substituteAll $src $target
+
+if test -n "$isExecutable"; then
+    chmod +x $target
+fi