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

Merge pull request #7112 from spwhitt/gtk3

Browse Source 
gtk3: fix Darwin build
This commit is contained in:
Eric Seidel 2015-04-01 14:03:38 -07:00
commit 422e91d0f9
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
intltool dbus_glib at_spi2_core libSM ]; intltool dbus_glib at_spi2_core libSM ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/development/libraries/at-spi2-core/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl";
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

6
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -21,12 +21,14 @@ stdenv.mkDerivation rec {
sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1";
}; };
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
buildInputs = [ libxkbcommon ]; buildInputs = [ libxkbcommon ];
propagatedBuildInputs = with xlibs; with stdenv.lib; propagatedBuildInputs = with xlibs; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] ++ optionals stdenv.isLinux [ wayland ]
++ optional stdenv.isDarwin x11 ++ optional stdenv.isDarwin x11
++ optional xineramaSupport libXinerama ++ optional xineramaSupport libXinerama
++ optional cupsSupport cups; ++ optional cupsSupport cups;

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

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