dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #18278: fontconfig: fix dependencies on OSX

Browse Source
This commit is contained in:
Vladimír Čunát 2016-09-06 08:32:00 +02:00
commit b4f9618b31
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/data/fonts/dejavu-fonts/default.nix
View File

@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
# See http://dejavu-fonts.org/wiki/License for details # See http://dejavu-fonts.org/wiki/License for details
license = stdenv.lib.licenses.free; license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

5
pkgs/tools/misc/fontforge/default.nix
View File

@ -31,11 +31,12 @@ stdenv.mkDerivation rec {
python freetype zlib glib libungif libpng libjpeg libtiff libxml2 python freetype zlib glib libungif libpng libjpeg libtiff libxml2
] ]
++ lib.optionals withGTK [ gtk2 pango ] ++ lib.optionals withGTK [ gtk2 pango ]
++ lib.optionals (withGTK && stdenv.isDarwin) [ Carbon Cocoa ]; ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
configureFlags = configureFlags =
lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]
++ lib.optional withGTK "--enable-gtk2-use"; ++ lib.optional withGTK "--enable-gtk2-use"
++ lib.optional (!withGTK) "--without-x";
preConfigure = '' preConfigure = ''
cp -r "${gnulib}" ./gnulib cp -r "${gnulib}" ./gnulib

4
pkgs/top-level/all-packages.nix
View File

@ -1625,7 +1625,9 @@ in
flvtool2 = callPackage ../tools/video/flvtool2 { }; flvtool2 = callPackage ../tools/video/flvtool2 { };
fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); fontforge = lowPrio (callPackage ../tools/misc/fontforge {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
});
fontforge-gtk = callPackage ../tools/misc/fontforge { fontforge-gtk = callPackage ../tools/misc/fontforge {
withGTK = true; withGTK = true;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;