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/fontconfig | |
| 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/fontconfig')
| -rwxr-xr-x | pkgs/development/libraries/fontconfig/builder.sh | 17 |
1 files changed, 9 insertions, 8 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 |