diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-17 15:33:49 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-17 15:33:49 +0000 |
| commit | 97202ee3b72f5c3a373be1482344adbde7eb073d (patch) | |
| tree | effdb3b68d4368c12f56f57287327516f2c4e26d /pkgs/stdenv/mingw | |
| parent | deaacb7a0f9df5e0f20bd98265094f7d871c09cd (diff) | |
| download | nixlib-97202ee3b72f5c3a373be1482344adbde7eb073d.tar nixlib-97202ee3b72f5c3a373be1482344adbde7eb073d.tar.gz nixlib-97202ee3b72f5c3a373be1482344adbde7eb073d.tar.bz2 nixlib-97202ee3b72f5c3a373be1482344adbde7eb073d.tar.lz nixlib-97202ee3b72f5c3a373be1482344adbde7eb073d.tar.xz nixlib-97202ee3b72f5c3a373be1482344adbde7eb073d.tar.zst nixlib-97202ee3b72f5c3a373be1482344adbde7eb073d.zip | |
Patch for aterm library on mingw (see meta-devel-list)
Moved all the shell fixes to fix-builder.sh, which is now always invoked. Added aterm to the list of packages provided by mingw.nix svn path=/nixpkgs/trunk/; revision=6152
Diffstat (limited to 'pkgs/stdenv/mingw')
| -rw-r--r-- | pkgs/stdenv/mingw/default.nix | 2 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/fix-builder.sh | 17 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/setup.sh | 10 |
3 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix index 69b41aea694e..4c17e73fb548 100644 --- a/pkgs/stdenv/mingw/default.nix +++ b/pkgs/stdenv/mingw/default.nix @@ -98,7 +98,7 @@ let { if attrs ? builder then [./fix-builder.sh attrs.builder] else - ./default-builder.sh + [./fix-builder.sh ./default-builder.sh] ) ]; inherit stdenv system; diff --git a/pkgs/stdenv/mingw/fix-builder.sh b/pkgs/stdenv/mingw/fix-builder.sh index 76875babd3e0..42c41dc3283b 100755 --- a/pkgs/stdenv/mingw/fix-builder.sh +++ b/pkgs/stdenv/mingw/fix-builder.sh @@ -1,12 +1,15 @@ # Workaround MSYS shell problem + if test -z "$out"; then - stdenv="$STDENV" - out="$OUT" - src="$SRC" - srcs="$SRCS" - buildInputs="$BUILDINPUTS" - propagatedBuildInputs="$PROPAGATEDBUILDINPUTS" - succeedOnFailure="$SUCCEEDONFAILURE" + stdenv=$STDENV + out=$OUT + src=$SRC + srcs=$SRCS + buildInputs=$BUILDINPUTS + propagatedBuildInputs=$PROPAGATEDBUILDINPUTS + succeedOnFailure=$SUCCEEDONFAILURE + patches=$PATCHES + doCheck=$DOCHECK fi source $@ diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh index 9d53f487540d..11705f8310fe 100755 --- a/pkgs/stdenv/mingw/setup.sh +++ b/pkgs/stdenv/mingw/setup.sh @@ -2,16 +2,6 @@ set -e test -z $NIX_GCC && NIX_GCC=@GCC@ -# Workaround MSYS shell problem -if test -z "$out"; then - out="$OUT" - src="$SRC" - srcs="$SRCS" - buildInputs="$BUILDINPUTS" - propagatedBuildInputs="$PROPAGATEDBUILDINPUTS" - succeedOnFailure="$SUCCEEDONFAILURE" -fi - # Set up the initial path. PATH= for i in $NIX_GCC @INITIALPATH@; do |