public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pango on darwin: attempt to fix build 

Supply older flex (new doesn't build), and disable introspection.
This commit is contained in:
Vladimír Čunát 2014-04-10 20:37:52 +02:00
parent 8aa84644f9
commit 297bcd2088
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/pango/default.nix
View File

@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
}; };
buildInputs = [ gobjectIntrospection ] buildInputs = with stdenv.lib;
++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; optional (!stdenv.isDarwin) gobjectIntrospection # build problems
++ optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

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

@ -4564,7 +4564,9 @@ let
}; };
cairomm = callPackage ../development/libraries/cairomm { }; cairomm = callPackage ../development/libraries/cairomm { };
pango = callPackage ../development/libraries/pango { }; pango = callPackage ../development/libraries/pango (
lib.optionalAttrs stdenv.isDarwin { flex = flex_2_5_35; } # flex fails to build
);
pangomm = callPackage ../development/libraries/pangomm { }; pangomm = callPackage ../development/libraries/pangomm { };
pangox_compat = callPackage ../development/libraries/pangox-compat { }; pangox_compat = callPackage ../development/libraries/pangox-compat { };