diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-09 10:59:55 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-09 10:59:55 +0000 |
| commit | d74192ee389df646868c0f659b4392d85c75fb06 (patch) | |
| tree | 35cab3d079904e83568d40c2d30464c5c0b6f4a9 /pkgs/development/libraries/libpng | |
| parent | c8455be838dfb8ff53b6c4bec139659a974de42d (diff) | |
| download | nixlib-d74192ee389df646868c0f659b4392d85c75fb06.tar nixlib-d74192ee389df646868c0f659b4392d85c75fb06.tar.gz nixlib-d74192ee389df646868c0f659b4392d85c75fb06.tar.bz2 nixlib-d74192ee389df646868c0f659b4392d85c75fb06.tar.lz nixlib-d74192ee389df646868c0f659b4392d85c75fb06.tar.xz nixlib-d74192ee389df646868c0f659b4392d85c75fb06.tar.zst nixlib-d74192ee389df646868c0f659b4392d85c75fb06.zip | |
* propagated-build-inputs should now be placed in $out/nix-support.
svn path=/nixpkgs/trunk/; revision=823
Diffstat (limited to 'pkgs/development/libraries/libpng')
| -rwxr-xr-x | pkgs/development/libraries/libpng/builder.sh | 25 |
1 files changed, 13 insertions, 12 deletions
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 |