From ffcea6546d4832d5141add56f1d6126a6fd33a5e Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Fri, 22 May 2015 20:08:22 -0400 Subject: gtk3: fix on Darwin --- pkgs/development/libraries/gtk+/3.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 18aaa9fa2282..252e52ee3b98 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -25,12 +25,13 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy ]; propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] - ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] - ++ optional stdenv.isDarwin x11 + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optionals stdenv.isLinux [ wayland ] ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + # demos fail to install, no idea where's the problem preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; @@ -64,6 +65,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.linux; # Temporary until fixed for darwin + platforms = stdenv.lib.platforms.all; }; } -- cgit 1.4.1