diff options
-rwxr-xr-x | pkgs/development/libraries/aterm/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/aterm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/nix-linux/default.nix | 49 |
3 files changed, 34 insertions, 22 deletions
diff --git a/pkgs/development/libraries/aterm/builder.sh b/pkgs/development/libraries/aterm/builder.sh index 5946961adc58..77432d7ff5b6 100755 --- a/pkgs/development/libraries/aterm/builder.sh +++ b/pkgs/development/libraries/aterm/builder.sh @@ -1,6 +1,3 @@ -#! /bin/sh - . $stdenv/setup - configureFlags="--with-gcc" genericBuild diff --git a/pkgs/development/libraries/aterm/default.nix b/pkgs/development/libraries/aterm/default.nix index 2d2a946f60a9..bac496ecebca 100644 --- a/pkgs/development/libraries/aterm/default.nix +++ b/pkgs/development/libraries/aterm/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "aterm-2.0.5"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.5.tar.gz; md5 = "68aefb0c10b2ab876b8d3c0b2d0cdb1b"; }; - inherit stdenv; } diff --git a/pkgs/stdenv/nix-linux/default.nix b/pkgs/stdenv/nix-linux/default.nix index 7219ae05726b..f7230ce1b298 100644 --- a/pkgs/stdenv/nix-linux/default.nix +++ b/pkgs/stdenv/nix-linux/default.nix @@ -1,19 +1,36 @@ {stdenv, glibc, pkgs, genericStdenv, gccWrapper}: -genericStdenv { - name = "stdenv-nix-linux"; - preHook = ./prehook.sh; - initialPath = (import ../nix/path.nix) {pkgs = pkgs;}; - - inherit stdenv; - - gcc = gccWrapper { - name = pkgs.gcc.name; - nativeTools = false; - nativeGlibc = false; - inherit (pkgs) gcc binutils; - inherit stdenv glibc; - }; - - param1 = pkgs.bash; +let { + + body = + + genericStdenv { + name = "stdenv-nix-linux"; + preHook = ./prehook.sh; + initialPath = (import ../nix/path.nix) {pkgs = pkgs;}; + + inherit stdenv; + + gcc = gccWrapper { + name = pkgs.gcc.name; + nativeTools = false; + nativeGlibc = false; + inherit (pkgs) gcc binutils; + inherit stdenv glibc; + }; + + param1 = pkgs.bash; + } + + # Add a utility function to produce derivations that use this + # stdenv and its the bash shell. + // { + mkDerivation = attrs: derivation (attrs // { + builder = pkgs.bash ~ /bin/sh; + args = ["-e" attrs.builder]; + stdenv = body; + system = body.system; + }); + }; + } |