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

libgsf and libextractor: allow build without gtk/gnome

Browse Source 
I leave them enabled by default though; I don't really know how much it helps,
having them built with gtk or gnome support.

I head towards building gnunet without gtk dependencies.
This commit is contained in:
Lluís Batlle i Rossell 2012-07-11 20:05:36 +02:00
parent 945a3480d4
commit db46c668b8
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libextractor/default.nix
View File

@ -1,5 +1,8 @@
{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2 { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2
, ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }: , ffmpeg, exiv2, libgsf, rpm, pkgconfig
, gtkSupport ? true, glib ? null, gtk ? null}:
assert gtkSupport -> glib != null && gtk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libextractor-0.6.2"; name = "libextractor-0.6.2";
@ -18,8 +21,8 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg
libgsf rpm libgsf rpm
pkgconfig glib gtk pkgconfig
]; ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ];
configureFlags = "--disable-ltdl-install " configureFlags = "--disable-ltdl-install "
+ "--with-ltdl-include=${libtool}/include " + "--with-ltdl-include=${libtool}/include "

13
pkgs/development/libraries/libgsf/default.nix
View File

@ -1,7 +1,10 @@
{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2
, glib, gettext, intltool, bzip2, gdk_pixbuf , gettext, intltool, bzip2, python
, gnome_vfs, libbonobo, python }: , gnomeSupport ? true, glib ? null, gdk_pixbuf ? null
, gnome_vfs ? null, libbonobo ? null }:
assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null
&& glib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgsf-1.14.22"; name = "libgsf-1.14.22";
@ -13,9 +16,11 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ intltool pkgconfig ]; buildNativeInputs = [ intltool pkgconfig ];
buildInputs = buildInputs =
[ perl perlXMLParser gettext bzip2 gnome_vfs python gdk_pixbuf ]; [ perl perlXMLParser gettext bzip2 gnome_vfs python ]
++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf python ];
propagatedBuildInputs = [ glib libxml2 libbonobo ]; propagatedBuildInputs = [ libxml2 ]
++ stdenv.lib.optionals gnomeSupport [ libbonobo glib ];
doCheck = true; doCheck = true;