Author: eelco
Date: Mon Feb 14 13:44:01 2011
New Revision: 25961
URL: https://svn.nixos.org/websvn/nix/?rev=25961&sc=1
Log:
* gdk-pixbuf: build gdk-pixbuf-xlib.
Modified:
nixpkgs/branches/x-updates/pkgs/applications/graphics/xscreensaver/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
Modified:
nixpkgs/branches/x-updates/pkgs/applications/graphics/xscreensaver/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/graphics/xscreensaver/default.nix
Mon Feb 14 13:43:37 2011 (r25960)
+++
nixpkgs/branches/x-updates/pkgs/applications/graphics/xscreensaver/default.nix
Mon Feb 14 13:44:01 2011 (r25961)
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, pam
, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
, libXxf86misc
-, libjpeg, mesa, gtk , libxml2, libglade}:
+, libjpeg, mesa, gtk, libxml2, libglade
+}:
stdenv.mkDerivation rec {
version = "5.12";
@@ -14,17 +15,15 @@
buildInputs =
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
- libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
- libXxf86misc ];
+ libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
+ libXxf86misc
+ ];
configureFlags =
- [
- "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
-
+ [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
"--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
"--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
-
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
];
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
Mon Feb 14 13:43:37 2011 (r25960)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
Mon Feb 14 13:44:01 2011 (r25961)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.22.1";
@@ -7,8 +7,9 @@
url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2";
sha256 =
"6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d";
};
-
- buildInputs = [ pkgconfig glib libtiff libjpeg libpng ];
+
+ # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
+ buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ];
postInstall = "rm -rf $out/share/gtk-doc";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
