diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:56 +0200 |
| commit | f8c211fd2b53d970a439d643bea9d0928fb08666 (patch) | |
| tree | 5084d953ed0e15e81e556c5db1399143c8069fc8 /pkgs/development/libraries | |
| parent | 32b31398eb562152a11d1be992c5ea6e110013f5 (diff) | |
| download | nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.gz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.bz2 nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.lz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.xz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.zst nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.zip | |
fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index b03528de2d5d..f72f65ddad74 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { }) ]; + outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config + propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 2b02e0df7a04..2d0a21ea9ddf 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -8,9 +8,9 @@ runCommand "fonts.conf" } '' xsltproc --stringparam fontDirectories "$fontDirectories" \ - --stringparam fontconfig "${fontconfig}" \ + --stringparam fontconfig "${fontconfig.out}" \ --stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \ - --path ${fontconfig}/share/xml/fontconfig \ - ${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \ + --path ${fontconfig.out}/share/xml/fontconfig \ + ${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \ > $out '' diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 08d8f141deb0..82345b86e960 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation { ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft - -L${libXft}/lib -I${libXft}/include - -L${libXft.freetype}/lib -I${libXft.freetype}/include - -L${libXft.fontconfig}/lib -I${libXft.fontconfig}/include" else "-no-xft"} + -L${libXft.out}/lib -I${libXft.dev}/include + -L${libXft.freetype.lib}/lib -I${libXft.freetype.dev}/include + -L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"} "; patches = [ |