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

* Don't use another instance of GTK - 4 is enough already ;-)

Browse Source 
* libbonobui needs gettext for libintl.h header goodness.

svn path=/nixpkgs/trunk/; revision=2313
This commit is contained in:
Eelco Dolstra 2005-02-27 02:08:17 +00:00
parent 51ce4ea2f7
commit 7bfb0c190d
6 changed files with 9 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gnome/atk/default.nix
View File

@ -1,9 +0,0 @@
{input, stdenv, fetchurl, pkgconfig, glib, perl}:
assert pkgconfig != null && glib != null && perl != null;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl];
propagatedBuildInputs = [glib];
}

25
pkgs/development/libraries/gnome/default.nix
View File

@ -3,7 +3,7 @@
{ stdenv, fetchurl, pkgconfig, audiofile
, flex, bison, popt, perl, zlib, libxml2, bzip2
, perlXMLParser, gettext, x11, libtiff, libjpeg
, libpng
, libpng, gtkLibs
}:
rec {
@ -14,26 +14,13 @@ rec {
inherit stdenv fetchurl;
};
glib = (import ./glib) {
inherit fetchurl stdenv pkgconfig gettext perl;
input = platform.glib;
};
glib = gtkLibs.glib;
atk = (import ./atk) {
inherit fetchurl stdenv pkgconfig glib perl;
input = platform.atk;
};
atk = gtkLibs.atk;
pango = (import ./pango) {
inherit fetchurl stdenv pkgconfig glib x11;
input = platform.pango;
};
pango = gtkLibs.pango;
gtk = (import ./gtk+) {
inherit fetchurl stdenv pkgconfig glib atk pango perl
libtiff libjpeg libpng x11;
input = platform.gtk;
};
gtk = gtkLibs.gtk;
esound = (import ./esound) {
inherit fetchurl stdenv audiofile;
@ -118,7 +105,7 @@ rec {
libbonoboui = (import ./libbonoboui) {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade
libgnome libgnomecanvas;
libgnome libgnomecanvas gettext;
input = platform.libbonoboui;
};

8
pkgs/development/libraries/gnome/glib/default.nix
View File

@ -1,8 +0,0 @@
{input, stdenv, fetchurl, pkgconfig, gettext, perl}:
assert pkgconfig != null && gettext != null && perl != null;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig gettext perl];
}

17
pkgs/development/libraries/gnome/gtk+/default.nix
View File

@ -1,17 +0,0 @@
{input, stdenv, fetchurl, pkgconfig, x11, glib, atk
, pango, perl, libtiff, libjpeg, libpng}:
assert pkgconfig != null && x11 != null && glib != null && atk != null
&& pango != null && perl != null && perl != null && libtiff != null
&& libjpeg != null && libpng != null;
assert x11.buildClientLibs;
#assert glib == atk.glib;
#assert glib == pango.glib;
#assert x11 == pango.x11;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl libtiff libjpeg libpng];
propagatedBuildInputs = [x11 glib atk pango];
inherit libtiff libjpeg libpng;
}

6
pkgs/development/libraries/gnome/libbonoboui/default.nix
View File

@ -1,5 +1,5 @@
{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome
, libgnomecanvas}:
{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome
, libgnomecanvas, gettext}:
assert pkgconfig != null && perl != null && libxml2 != null
&& libglade != null && libgnome != null && libgnomecanvas != null;
@ -7,7 +7,7 @@ assert pkgconfig != null && perl != null && libxml2 != null
# todo 2.8.1 doesn;t work
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig perl libglade];
buildInputs = [pkgconfig perl libglade gettext];
propagatedBuildInputs = [libxml2 libgnome libgnomecanvas];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";

10
pkgs/development/libraries/gnome/pango/default.nix
View File

@ -1,10 +0,0 @@
{input, stdenv, fetchurl, pkgconfig, x11, glib}:
assert pkgconfig != null && x11 != null && glib != null;
assert x11.buildClientLibs;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [pkgconfig];
propagatedBuildInputs = [x11 glib];
}