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

Merge pull request #7950 from spwhitt/gtk3

Browse Source 
gtk3: fix on Darwin
This commit is contained in:
William A. Kennington III 2015-05-22 19:32:21 -07:00
commit ea7805b5fd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/anholt/libepoxy;
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

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

@ -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;
};
}