ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

pango on darwin: amend the wrong fix

Browse Source 
I didn't realize pango doesn't depend on flex directly,
only through introspection which caused build problems by itself, too.
This commit is contained in:
Vladimír Čunát 2014-04-11 09:55:46 +02:00
parent e2e74154e2
commit 8c12816d59
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
optional (!stdenv.isDarwin) gobjectIntrospection # build problems optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex
++ optionals stdenv.isDarwin [ gettext fontconfig ]; ++ optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

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

@ -4568,9 +4568,7 @@ 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 { };