diff options
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
-rw-r--r-- | pkgs/development/libraries/fontconfig/2.10.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 2951dbb44d4..fea9efde1cf 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -16,6 +16,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/default.nix b/pkgs/development/libraries/fontconfig/default.nix index b03528de2d5..6acf1ebce29 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 ]; @@ -65,7 +67,7 @@ stdenv.mkDerivation rec { postInstall = '' cd "$out/etc/fonts" rm conf.d/{50-user,51-local}.conf - "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ + "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ --stringparam fontconfig "$out" \ --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 2b02e0df7a0..2d0a21ea9dd 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 '' |