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

gtk3: revise dependencies, xlibs -> xorg

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-28 12:07:52 +01:00
parent 91329b5c0a
commit 8e73a7bf53
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@
, cupsSupport ? stdenv.isLinux, cups ? null , cupsSupport ? stdenv.isLinux, cups ? null
}: }:
assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
let let
@ -26,14 +25,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
buildInputs = [ libxkbcommon epoxy ]; buildInputs = [ libxkbcommon epoxy json_glib ];
propagatedBuildInputs = with xlibs; with stdenv.lib; propagatedBuildInputs = with xorg; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optionals stdenv.isLinux [ wayland ] ++ optionals stdenv.isLinux [ wayland ]
++ optional xineramaSupport libXinerama ++ optional xineramaSupport libXinerama
++ optional cupsSupport cups; ++ optional cupsSupport cups;
#TODO: colord?
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
# demos fail to install, no idea where's the problem # demos fail to install, no idea where's the problem
preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
@ -41,7 +42,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = '' postInstall = ''
rm -rf $out/share/gtk-doc
substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \ substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
--replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib' --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
''; '';
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
''; # workaround for bug of nix-mode for Emacs */ ''; ''; # workaround for bug of nix-mode for Emacs */ '';
}; };
meta = { meta = with stdenv.lib; {
description = "A multi-platform toolkit for creating graphical user interfaces"; description = "A multi-platform toolkit for creating graphical user interfaces";
longDescription = '' longDescription = ''
@ -69,9 +69,9 @@ stdenv.mkDerivation rec {
homepage = http://www.gtk.org/; homepage = http://www.gtk.org/;
license = stdenv.lib.licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; maintainers = with maintainers; [ urkud raskin vcunat lethalman ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }