alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* gdk-pixbuf: build gdk-pixbuf-xlib.

Browse source 
svn path=/nixpkgs/branches/x-updates/; revision=25961
This commit is contained in:
Eelco Dolstra 2011-02-14 13:44:01 +00:00
parent 8df800d92c
commit 070f7debe0
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/graphics/xscreensaver/default.nix
View file

@ -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 @@ stdenv.mkDerivation rec {
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"
];

7
pkgs/development/libraries/gdk-pixbuf/2.22.x.nix
View file

@ -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 @@ stdenv.mkDerivation rec {
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";