diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-07-11 20:15:06 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-07-11 20:15:06 +0200 |
| commit | 6163742ea4f21cde506aa31ef4209de1db11fcab (patch) | |
| tree | 4835f103f67dae03077d8935f626ac500952260d /pkgs/development/libraries/libgsf | |
| parent | 715737b3ac2f6ca2aeb63ec147757790f4048af2 (diff) | |
| download | nixpkgs-6163742ea4f21cde506aa31ef4209de1db11fcab.tar nixpkgs-6163742ea4f21cde506aa31ef4209de1db11fcab.tar.gz nixpkgs-6163742ea4f21cde506aa31ef4209de1db11fcab.tar.bz2 nixpkgs-6163742ea4f21cde506aa31ef4209de1db11fcab.tar.lz nixpkgs-6163742ea4f21cde506aa31ef4209de1db11fcab.tar.xz nixpkgs-6163742ea4f21cde506aa31ef4209de1db11fcab.tar.zst nixpkgs-6163742ea4f21cde506aa31ef4209de1db11fcab.zip | |
libgsf: fix build without gnome support
I recently committed it with broken without-gnome support.
Diffstat (limited to 'pkgs/development/libraries/libgsf')
| -rw-r--r-- | pkgs/development/libraries/libgsf/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 01891ccf360..3941fd4d694 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, gettext, intltool, bzip2, python -, gnomeSupport ? true, glib ? null, gdk_pixbuf ? null +, gettext, intltool, bzip2, glib, python +, gnomeSupport ? true, gdk_pixbuf ? null , gnome_vfs ? null, libbonobo ? null }: assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ intltool pkgconfig ]; buildInputs = - [ perl perlXMLParser gettext bzip2 gnome_vfs python ] - ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf python ]; + [ perl perlXMLParser gettext bzip2 python ] + ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; - propagatedBuildInputs = [ libxml2 ] - ++ stdenv.lib.optionals gnomeSupport [ libbonobo glib ]; + propagatedBuildInputs = [ libxml2 glib ] + ++ stdenv.lib.optionals gnomeSupport [ libbonobo ]; doCheck = true; |