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

non-Linux: more adjustments

Browse Source 
Also reordered stuff in all-packages.nix.
This commit is contained in:
Vladimír Čunát 2013-06-18 23:42:25 +02:00
parent 83dee22f4a
commit 1f81984293
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
, expat, systemd, glib, dbus_glib, python , expat, systemd, glib, dbus_glib, python
, libX11, libICE, libSM, useX11 ? true }: , libX11, libICE, libSM, useX11 ? stdenv.isLinux }:
let let
version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8 version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8

4
pkgs/development/libraries/glib/default.nix
View File

@ -33,11 +33,11 @@ stdenv.mkDerivation (rec {
}; };
# configure script looks for d-bus but it is only needed for tests # configure script looks for d-bus but it is only needed for tests
buildInputs = [ libelf ] ++ libiconvOrEmpty; buildInputs = [ libelf ];
nativeBuildInputs = [ perl pkgconfig gettext python ]; nativeBuildInputs = [ perl pkgconfig gettext python ];
propagatedBuildInputs = [ pcre zlib libffi ]; propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty;
configureFlags = "--with-pcre=system --disable-fam"; configureFlags = "--with-pcre=system --disable-fam";

17
pkgs/development/libraries/gtk+/2.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf, libintlOrEmpty , gdk_pixbuf, libintlOrEmpty, x11
, xineramaSupport ? true , xineramaSupport ? stdenv.isLinux
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
}: }:
@ -21,13 +21,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig gettext ]; nativeBuildInputs = [ perl pkgconfig gettext ];
propagatedBuildInputs = with xlibs; propagatedBuildInputs = with xlibs; with stdenv.lib;
[ glib cairo pango gdk_pixbuf atk [ glib cairo pango gdk_pixbuf atk ]
libXrandr libXrender libXcomposite libXi libXcursor ++ optionals stdenv.isLinux
] [ libXrandr libXrender libXcomposite libXi libXcursor ]
++ optional stdenv.isDarwin x11
++ libintlOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optional xineramaSupport libXinerama ++ optional xineramaSupport libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ]; ++ optionals cupsSupport [ cups ];
configureFlags = "--with-xinput=yes"; configureFlags = "--with-xinput=yes";

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gettext { stdenv, fetchurl, pkgconfig, gettext
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs
, xineramaSupport ? true , xineramaSupport ? stdenv.isLinux
, cupsSupport ? true, cups ? null , cupsSupport ? stdenv.isLinux, cups ? null
}: }:
assert xineramaSupport -> xlibs.libXinerama != null; assert xineramaSupport -> xlibs.libXinerama != null;

4
pkgs/development/libraries/poppler/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty { stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg , zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
, qt4Support ? false, qt4 ? null , qt4Support ? false, qt4 ? null
}: }:
@ -28,7 +28,7 @@ let
propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ]; propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ];
nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty;
cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";

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

@ -4114,15 +4114,13 @@ let
atk = callPackage ../development/libraries/atk { }; atk = callPackage ../development/libraries/atk { };
atkmm = callPackage ../development/libraries/atkmm { }; atkmm = callPackage ../development/libraries/atkmm { };
pixman = callPackage ../development/libraries/pixman { };
cairo = callPackage ../development/libraries/cairo { cairo = callPackage ../development/libraries/cairo {
glSupport = lib.elem system lib.platforms.mesaPlatforms; glSupport = lib.elem system lib.platforms.mesaPlatforms;
}; };
pixman = callPackage ../development/libraries/pixman { };
cairomm = callPackage ../development/libraries/cairomm { };
cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { };
cairomm = callPackage ../development/libraries/cairomm { };
pango = callPackage ../development/libraries/pango { }; pango = callPackage ../development/libraries/pango { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
@ -4132,7 +4130,7 @@ let
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
cupsSupport = config.gtk2.cups or true; cupsSupport = config.gtk2.cups or stdenv.isLinux;
}; };
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix {