diff options
24 files changed, 223 insertions, 198 deletions
diff --git a/pkgs/development/libraries/fontconfig/builder.sh b/pkgs/development/libraries/fontconfig/builder.sh index 3b705bd9ecab..7a521ea16f00 100755 --- a/pkgs/development/libraries/fontconfig/builder.sh +++ b/pkgs/development/libraries/fontconfig/builder.sh @@ -1,18 +1,19 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$freetype $expat $x11 $ed" -. $stdenv/setup || exit 1 +. $stdenv/setup # Fontconfig generates a bad `fonts.conf' file is the timezone is not known # (because it calls `date'). export TZ=UTC -tar xvfz $src || exit 1 -cd fontconfig-* || exit 1 +tar xvfz $src +cd fontconfig-* ./configure --prefix=$out --with-confdir=$out/etc/fonts \ --x-includes=$x11/include --x-libraries=$x11/lib \ - --with-expat-includes=$expat/include --with-expat-lib=$expat/lib || exit 1 -make || exit 1 -make install || exit 1 + --with-expat-includes=$expat/include --with-expat-lib=$expat/lib +make +make install -echo "$freetype" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$freetype" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh index 249ab0872ac6..e3842a81c1db 100755 --- a/pkgs/development/libraries/glibc/builder.sh +++ b/pkgs/development/libraries/glibc/builder.sh @@ -2,25 +2,25 @@ # glibc cannot have itself in its rpath. export NIX_NO_SELF_RPATH=1 -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $glibcSrc || exit 1 -(cd glibc-* && tar xvfj $linuxthreadsSrc) || exit 1 +tar xvfj $glibcSrc +(cd glibc-* && tar xvfj $linuxthreadsSrc) -(cd glibc-* && patch -p1 < $vaargsPatch) || exit 1 +(cd glibc-* && patch -p1 < $vaargsPatch) -mkdir build || exit 1 -cd build || exit 1 -LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile || exit 1 +mkdir build +cd build +LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile -make || exit 1 -make install || exit 1 -#make localedata/install-locales || exit 1 -strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so -strip -s $out/bin/* $out/sbin/* $out/libexec/* +make +make install +#make localedata/install-locales +strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so || true +strip -s $out/bin/* $out/sbin/* $out/libexec/* || true -ln -sf /etc/ld.so.cache $out/etc/ld.so.cache || exit 1 +ln -sf /etc/ld.so.cache $out/etc/ld.so.cache -(cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 +(cd $out/include && ln -s $kernelHeaders/include/* .) exit 0 diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index bf001b85b2a4..6af83b3f72e7 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, kernelHeaders}: derivation { +{stdenv, fetchurl, kernelHeaders}: + +derivation { name = "glibc-2.3.2"; system = stdenv.system; builder = ./builder.sh; @@ -16,6 +18,5 @@ # later releases of glibc won't need this. vaargsPatch = ./glibc-2.3.2-sscanf-1.patch; - stdenv = stdenv; - kernelHeaders = kernelHeaders; + inherit stdenv kernelHeaders; } diff --git a/pkgs/development/libraries/gnome/GConf/builder.sh b/pkgs/development/libraries/gnome/GConf/builder.sh index 7d69d2682226..814beb573617 100755 --- a/pkgs/development/libraries/gnome/GConf/builder.sh +++ b/pkgs/development/libraries/gnome/GConf/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $perl $glib $gtk $libxml2 $ORBit2 $popt" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd GConf-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd GConf-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$ORBit2" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$ORBit2" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/ORBit2/builder.sh b/pkgs/development/libraries/gnome/ORBit2/builder.sh index eab224fcb9ce..87dbfe6cf992 100755 --- a/pkgs/development/libraries/gnome/ORBit2/builder.sh +++ b/pkgs/development/libraries/gnome/ORBit2/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $glib $libIDL $popt" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd ORBit2-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd ORBit2-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$glib" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$glib" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/esound/builder.sh b/pkgs/development/libraries/gnome/esound/builder.sh index 0e533fd9caf9..bebb21cafdaf 100755 --- a/pkgs/development/libraries/gnome/esound/builder.sh +++ b/pkgs/development/libraries/gnome/esound/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$audiofile" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd esound-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd esound-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$audiofile" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$audiofile" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/libbonobo/builder.sh b/pkgs/development/libraries/gnome/libbonobo/builder.sh index 8e728599a23c..eb53f4f9648d 100755 --- a/pkgs/development/libraries/gnome/libbonobo/builder.sh +++ b/pkgs/development/libraries/gnome/libbonobo/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $perl $ORBit2 $libxml2 $popt $yacc $flex" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libbonobo-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd libbonobo-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$ORBit2 $popt" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$ORBit2 $popt" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/libbonoboui/builder.sh b/pkgs/development/libraries/gnome/libbonoboui/builder.sh index 7351cbf7594b..a01414983503 100755 --- a/pkgs/development/libraries/gnome/libbonoboui/builder.sh +++ b/pkgs/development/libraries/gnome/libbonoboui/builder.sh @@ -1,14 +1,15 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $perl $libxml2 $libglade $libgnome \ $libgnomecanvas" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libbonoboui-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd libbonoboui-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$libxml2 $libgnome $libgnomecanvas" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$libxml2 $libgnome $libgnomecanvas" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/libglade/builder.sh b/pkgs/development/libraries/gnome/libglade/builder.sh index 0d39c60c1f8b..9917fd2c5e92 100755 --- a/pkgs/development/libraries/gnome/libglade/builder.sh +++ b/pkgs/development/libraries/gnome/libglade/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $gtk $libxml2" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libglade-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd libglade-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$gtk $libxml2" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$gtk $libxml2" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/libgnome/builder.sh b/pkgs/development/libraries/gnome/libgnome/builder.sh index 0199536e6571..30de2db56cdb 100755 --- a/pkgs/development/libraries/gnome/libgnome/builder.sh +++ b/pkgs/development/libraries/gnome/libgnome/builder.sh @@ -1,14 +1,15 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $perl $glib $gnomevfs $libbonobo $GConf \ $popt $zlib" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libgnome-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd libgnome-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$glib $gnomevfs $libbonobo $GConf" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$glib $gnomevfs $libbonobo $GConf" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh b/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh index a68c9e827b37..550ee65a8d0a 100755 --- a/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh +++ b/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $gtk $libart $libglade" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libgnomecanvas-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd libgnomecanvas-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$gtk $libart" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$gtk $libart" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gnome/libgnomeui/builder.sh b/pkgs/development/libraries/gnome/libgnomeui/builder.sh index d32e38578f42..23711d9ea6f5 100755 --- a/pkgs/development/libraries/gnome/libgnomeui/builder.sh +++ b/pkgs/development/libraries/gnome/libgnomeui/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $libgnome $libgnomecanvas $libbonoboui $libglade" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libgnomeui-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a $out/lib/libglade/*/*.a || exit 1 +tar xvfj $src +cd libgnomeui-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a $out/lib/libglade/*/*.a -echo "$libgnome $libgnomecanvas $libbonoboui" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$libgnome $libgnomecanvas $libbonoboui" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh b/pkgs/development/libraries/gtk+-1/gtk+/builder.sh index 0487465727ae..38cd16b31c78 100755 --- a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh +++ b/pkgs/development/libraries/gtk+-1/gtk+/builder.sh @@ -1,12 +1,13 @@ #! /bin/sh buildinputs="$x11 $glib" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfz $src || exit 1 -cd gtk+-* || exit 1 -./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 -make || exit 1 -make install || exit 1 +tar xvfz $src +cd gtk+-* +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib +make +make install -echo "$x11 $glib" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$x11 $glib" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gtk+/atk/builder.sh b/pkgs/development/libraries/gtk+/atk/builder.sh index 212b5dbe2875..be57a268c124 100755 --- a/pkgs/development/libraries/gtk+/atk/builder.sh +++ b/pkgs/development/libraries/gtk+/atk/builder.sh @@ -1,10 +1,13 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $perl $glib" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd atk-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 +tar xvfj $src +cd atk-* +./configure --prefix=$out +make +make install + +mkdir $out/nix-support +echo "$glib" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gtk+/gtk+/builder.sh b/pkgs/development/libraries/gtk+/gtk+/builder.sh index e8835feb3a70..f899bec6cb61 100755 --- a/pkgs/development/libraries/gtk+/gtk+/builder.sh +++ b/pkgs/development/libraries/gtk+/gtk+/builder.sh @@ -1,12 +1,13 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $x11 $glib $atk $pango $perl $libtiff $libjpeg $libpng" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd gtk+-* || exit 1 -./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 -make || exit 1 -make install || exit 1 +tar xvfj $src +cd gtk+-* +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib +make +make install -echo "$x11 $glib $atk $pango" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$x11 $glib $atk $pango" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/gtk+/pango/builder.sh b/pkgs/development/libraries/gtk+/pango/builder.sh index daa6001cc17c..e3d0a68fd5f9 100755 --- a/pkgs/development/libraries/gtk+/pango/builder.sh +++ b/pkgs/development/libraries/gtk+/pango/builder.sh @@ -1,12 +1,13 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $x11 $glib $xft" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd pango-* || exit 1 -./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 -make || exit 1 -make install || exit 1 +tar xvfj $src +cd pango-* +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib +make +make install -echo "$xft" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$xft $glib" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/libpng/builder.sh b/pkgs/development/libraries/libpng/builder.sh index d601bfa5fbf0..51e7a38a831c 100755 --- a/pkgs/development/libraries/libpng/builder.sh +++ b/pkgs/development/libraries/libpng/builder.sh @@ -1,16 +1,17 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$zlib" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd libpng-* || exit 1 -make -f scripts/makefile.linux || exit 1 -mkdir $out || exit 1 -mkdir $out/bin || exit 1 -mkdir $out/lib || exit 1 -mkdir $out/include || exit 1 -make -f scripts/makefile.linux install prefix=$out || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfj $src +cd libpng-* +make -f scripts/makefile.linux +mkdir $out +mkdir $out/bin +mkdir $out/lib +mkdir $out/include +make -f scripts/makefile.linux install prefix=$out +strip -S $out/lib/*.a -echo "$zlib" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$zlib" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/libtiff/builder.sh b/pkgs/development/libraries/libtiff/builder.sh index c237077c8b44..59fa97888e9c 100755 --- a/pkgs/development/libraries/libtiff/builder.sh +++ b/pkgs/development/libraries/libtiff/builder.sh @@ -1,16 +1,17 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$zlib $libjpeg" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfz $src || exit 1 -cd tiff-* || exit 1 +tar xvfz $src +cd tiff-* ./configure --prefix=$out --with-DIR_MAN=$out/man \ --with-ZIP --with-JPEG \ - --with-DIRS_LIBINC="$zlib/include $libjpeg/include" || exit 1 -make || exit 1 -mkdir $out || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 + --with-DIRS_LIBINC="$zlib/include $libjpeg/include" +make +mkdir $out +make install +strip -S $out/lib/*.a -echo "$zlib $libjpeg" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$zlib $libjpeg" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh index 3864be6eeb51..7d5979053279 100755 --- a/pkgs/development/libraries/libxml2/builder.sh +++ b/pkgs/development/libraries/libxml2/builder.sh @@ -1,13 +1,14 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$zlib" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfz $src || exit 1 -cd libxml2-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 -strip -S $out/lib/*.a || exit 1 +tar xvfz $src +cd libxml2-* +./configure --prefix=$out +make +make install +strip -S $out/lib/*.a -echo "$zlib" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$zlib" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/rna/builder.sh b/pkgs/development/libraries/rna/builder.sh index 34d343286665..a7ba75723fd4 100755 --- a/pkgs/development/libraries/rna/builder.sh +++ b/pkgs/development/libraries/rna/builder.sh @@ -10,4 +10,5 @@ make make install strip -S $out/lib/*.a -echo "$zlib" > $out/propagated-build-inputs \ No newline at end of file +mkdir $out/nix-support +echo "$zlib" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/libraries/xft/builder.sh b/pkgs/development/libraries/xft/builder.sh index f4432e079bff..2a2850ee7a5a 100755 --- a/pkgs/development/libraries/xft/builder.sh +++ b/pkgs/development/libraries/xft/builder.sh @@ -1,12 +1,13 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$pkgconfig $fontconfig $x11" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfz $src || exit 1 -cd xft-* || exit 1 -./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 -make || exit 1 -make install || exit 1 +tar xvfz $src +cd xft-* +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib +make +make install -echo "$fontconfig" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$fontconfig" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/tools/parsing/flex/builder-new.sh b/pkgs/development/tools/parsing/flex/builder-new.sh index e50cc48e4f61..dc78198f37dc 100755 --- a/pkgs/development/tools/parsing/flex/builder-new.sh +++ b/pkgs/development/tools/parsing/flex/builder-new.sh @@ -1,12 +1,13 @@ -#! /bin/sh +#! /bin/sh -e export buildinputs="$yacc $m4" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar xvfj $src || exit 1 -cd flex-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 +tar xvfj $src +cd flex-* +./configure --prefix=$out +make +make install -echo "$m4" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$m4" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/tools/parsing/pgen/builder.sh b/pkgs/development/tools/parsing/pgen/builder.sh index 107f8a258f0c..c0a41147baef 100644 --- a/pkgs/development/tools/parsing/pgen/builder.sh +++ b/pkgs/development/tools/parsing/pgen/builder.sh @@ -1,17 +1,18 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$aterm $getopt $toolbuslib $ptsupport $sdfsupport $asfsupport $ascsupport $sglr" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar zxf $src || exit 1 -cd pgen-* || exit 1 +tar zxf $src +cd pgen-* ./configure --prefix=$out --with-aterm=$aterm \ --with-toolbuslib=$toolbuslib \ --with-pt-support=$ptsupport \ --with-sdf-support=$sdfsupport \ --with-asf-support=$asfsupport \ --with-asc-support=$asfsupport \ - --with-sglr=$sglr || exit 1 -make install || exit 1 + --with-sglr=$sglr +make install -echo "$getopt" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$getopt" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/tools/parsing/sdf2/builder.sh b/pkgs/development/tools/parsing/sdf2/builder.sh index ed5728cc6c29..f12e8ca548ab 100755 --- a/pkgs/development/tools/parsing/sdf2/builder.sh +++ b/pkgs/development/tools/parsing/sdf2/builder.sh @@ -1,11 +1,12 @@ -#! /bin/sh +#! /bin/sh -e buildinputs="$aterm $getopt" -. $stdenv/setup || exit 1 +. $stdenv/setup -tar zxf $src || exit 1 -cd sdf2-bundle-* || exit 1 -./configure --prefix=$out --with-aterm=$aterm || exit 1 -make install || exit 1 +tar zxf $src +cd sdf2-bundle-* +./configure --prefix=$out --with-aterm=$aterm +make install -echo "$getopt" > $out/propagated-build-inputs || exit 1 +mkdir $out/nix-support +echo "$getopt" > $out/nix-support/propagated-build-inputs |