diff options
author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-02-26 23:45:19 +0000 |
---|---|---|
committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-02-26 23:45:19 +0000 |
commit | 51ce4ea2f7b2338afca99f3e1427e20f341fa947 (patch) | |
tree | b271ae034d8d62919aff1fc7bd7476c330f3658d | |
parent | ca968d823ca70231de2080752cddd9971aae2494 (diff) |
* development/libraries/gnome/*: upgraded all gnome packages
to 2.8.3.
* development/libraries/gnome/*: copied gtk packages to gnome
directory. gnome 2.8.3 did not work on gtk 2.4 nor gtk
2.6. Using the specific version of the gnome platform 2.8.3 directory
'solved' the issue.
* development/libraries/gnome/gnome-icon-theme: new packag
* development/libraries/gnome/libgtkhtml: new package
* development/libraries/gnome/gtkhtml: new package
* development/libraries/gnome/libgnomeprint: new package
* development/libraries/gnome/libgnomeprintui: new package
* development/libraries/gnome/gnome-keyring: new package
* development/libraries/gnome/gail: new package
* applications/editors/monodoc: new package
svn path=/nixpkgs/trunk/; revision=2312
32 files changed, 568 insertions, 109 deletions
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 6cd2c4733442..1dee7d2396a1 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mono, gtksharp, perl, perlXMLParser, pkgconfig, glib, gnomevfs, libbonobo}: +{stdenv, fetchurl, mono, gtksharp, perl, perlXMLParser, pkgconfig, glib, gconf, gnomevfs, libbonobo}: stdenv.mkDerivation { name = "MonoDevelop-0.5.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { md5 = "d89458a2d909da09b2cc1f37e16d8990"; }; - buildInputs = [mono gtksharp perl pkgconfig gnomevfs glib libbonobo]; + buildInputs = [mono gtksharp perl pkgconfig gnomevfs glib libbonobo gconf]; inherit perlXMLParser; }
\ No newline at end of file diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix new file mode 100644 index 000000000000..e4b4a5a22b3c --- /dev/null +++ b/pkgs/applications/editors/monodoc/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, mono, gtksharp, pkgconfig}: + +stdenv.mkDerivation { + name = "MonoDoc-1.0.6"; + + src = fetchurl { + url = http://www.go-mono.com/archive/1.0.6/monodoc-1.0.6.tar.gz; + md5 = "f2fc27e8e4717d90dc7efa2450625693"; + }; + + buildInputs = [mono gtksharp pkgconfig]; +} diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 91fc125319d7..89582846abc1 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -8,4 +8,5 @@ stdenv.mkDerivation { }; buildInputs = [bison pkgconfig glib]; + propagatedBuildInputs = [glib]; } diff --git a/pkgs/development/libraries/gnome/GConf/default.nix b/pkgs/development/libraries/gnome/GConf/default.nix index 2b1c4fea8cc1..74b646f6cc34 100644 --- a/pkgs/development/libraries/gnome/GConf/default.nix +++ b/pkgs/development/libraries/gnome/GConf/default.nix @@ -1,15 +1,12 @@ -{stdenv, fetchurl, pkgconfig, perl, glib, gtk, libxml2, ORBit2, popt}: +{input, stdenv, fetchurl, pkgconfig, perl, glib, gtk, libxml2, ORBit2, popt}: assert pkgconfig != null && perl != null && glib != null && gtk != null && libxml2 != null && ORBit2 != null && popt != null; stdenv.mkDerivation { - name = "GConf-2.4.0.1"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/GConf-2.4.0.1.tar.bz2; - md5 = "2f7548d0bad24d7c4beba54d0ec98a20"; - }; + inherit (input) name src; + # Perl is not `supposed' to be required, but it is. buildInputs = [pkgconfig perl glib gtk libxml2 popt]; propagatedBuildInputs = [ORBit2]; diff --git a/pkgs/development/libraries/gnome/ORBit2/default.nix b/pkgs/development/libraries/gnome/ORBit2/default.nix index adb214929ac0..69f62fb79a68 100644 --- a/pkgs/development/libraries/gnome/ORBit2/default.nix +++ b/pkgs/development/libraries/gnome/ORBit2/default.nix @@ -1,14 +1,10 @@ -{stdenv, fetchurl, pkgconfig, glib, libIDL, popt}: +{input, stdenv, fetchurl, pkgconfig, glib, libIDL, popt}: assert pkgconfig != null && glib != null && libIDL != null && popt != null; stdenv.mkDerivation { - name = "ORBit2-2.8.3"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/ORBit2-2.8.3.tar.bz2; - md5 = "c6c4b63de2f70310e33a52a37257ddaf"; - }; + inherit (input) name src; buildInputs = [pkgconfig libIDL popt]; propagatedBuildInputs = [glib]; } diff --git a/pkgs/development/libraries/gnome/atk/default.nix b/pkgs/development/libraries/gnome/atk/default.nix new file mode 100644 index 000000000000..72aef00555dd --- /dev/null +++ b/pkgs/development/libraries/gnome/atk/default.nix @@ -0,0 +1,9 @@ +{input, stdenv, fetchurl, pkgconfig, glib, perl}: + +assert pkgconfig != null && glib != null && perl != null; + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig perl]; + propagatedBuildInputs = [glib]; +} diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix index 75bd6d570304..ac52efc0f8ae 100644 --- a/pkgs/development/libraries/gnome/default.nix +++ b/pkgs/development/libraries/gnome/default.nix @@ -1,72 +1,157 @@ -{ stdenv, fetchurl, pkgconfig, audiofile, gtkLibs +# todo audiofile is also part of the gnome platform. Move it to this collection? + +{ stdenv, fetchurl, pkgconfig, audiofile , flex, bison, popt, perl, zlib, libxml2, bzip2 -, perlXMLParser +, perlXMLParser, gettext, x11, libtiff, libjpeg +, libpng }: rec { - glib = gtkLibs.glib; - gtk = gtkLibs.gtk; + # Platform + + platform = (import ./src-gnome-platform-2.8.3.nix) { + inherit stdenv fetchurl; + }; + + glib = (import ./glib) { + inherit fetchurl stdenv pkgconfig gettext perl; + input = platform.glib; + }; + + atk = (import ./atk) { + inherit fetchurl stdenv pkgconfig glib perl; + input = platform.atk; + }; + + pango = (import ./pango) { + inherit fetchurl stdenv pkgconfig glib x11; + input = platform.pango; + }; + + gtk = (import ./gtk+) { + inherit fetchurl stdenv pkgconfig glib atk pango perl + libtiff libjpeg libpng x11; + input = platform.gtk; + }; esound = (import ./esound) { inherit fetchurl stdenv audiofile; + input = platform.esound; }; libIDL = (import ./libIDL) { inherit fetchurl stdenv pkgconfig glib; + input = platform.libIDL; lex = flex; yacc = bison; }; ORBit2 = (import ./ORBit2) { inherit fetchurl stdenv pkgconfig glib libIDL popt; + input = platform.ORBit2; }; - GConf = (import ./GConf) { + gconf = (import ./GConf) { inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt; - }; - - libbonobo = (import ./libbonobo) { - inherit fetchurl stdenv pkgconfig perl ORBit2 libxml2 popt flex; - yacc = bison; + input = platform.gconf; }; gnomemimedata = (import ./gnome-mime-data) { - inherit fetchurl stdenv pkgconfig perl; + inherit fetchurl stdenv pkgconfig perl perlXMLParser; + input = platform.gnomemimedata; }; gnomevfs = (import ./gnome-vfs) { - inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf + inherit fetchurl stdenv pkgconfig perl glib libxml2 gconf libbonobo gnomemimedata popt bzip2 perlXMLParser; # !!! use stdenv.bzip2 + input = platform.gnomevfs; + }; + + gail = (import ./gail) { + inherit fetchurl stdenv pkgconfig; + inherit gtk atk libgnomecanvas; + input = platform.gail; }; libgnome = (import ./libgnome) { - inherit fetchurl stdenv pkgconfig perl glib gnomevfs - libbonobo GConf popt zlib; + inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gnomevfs + libbonobo gconf popt zlib; + input = platform.libgnome; + }; + + libgnomeprint = (import ./libgnomeprint) { + inherit fetchurl stdenv libxml2 perl perlXMLParser pkgconfig popt; + inherit glib pango; + libart = libart_lgpl; + input = platform.libgnomeprint; + }; + + libgnomeprintui = (import ./libgnomeprintui) { + inherit fetchurl stdenv perl perlXMLParser pkgconfig; + inherit gtk libgnomeprint libgnomecanvas gnomeicontheme; + input = platform.libgnomeprintui; }; libart_lgpl = (import ./libart_lgpl) { inherit fetchurl stdenv; + input = platform.libart_lgpl; }; libglade = (import ./libglade) { inherit fetchurl stdenv pkgconfig gtk libxml2; + input = platform.libglade; }; libgnomecanvas = (import ./libgnomecanvas) { inherit fetchurl stdenv pkgconfig gtk libglade; libart = libart_lgpl; + input = platform.libgnomecanvas; + }; + + libbonobo = (import ./libbonobo) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex; + yacc = bison; + input = platform.libbonobo; }; libbonoboui = (import ./libbonoboui) { - inherit fetchurl stdenv pkgconfig perl libxml2 libglade + inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade libgnome libgnomecanvas; + input = platform.libbonoboui; }; libgnomeui = (import ./libgnomeui) { inherit fetchurl stdenv pkgconfig libgnome libgnomecanvas - libbonoboui libglade; + libbonoboui libglade libjpeg esound gnomekeyring; + input = platform.libgnomeui; + }; + + # Desktop + + desktop = (import ./src-gnome-desktop-2.8.3.nix) { + inherit stdenv fetchurl; }; + gtkhtml = (import ./gtkhtml) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg; + inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme; + input = desktop.gtkhtml; + }; + + libgtkhtml = (import ./libgtkhtml) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 gail; + input = desktop.libgtkhtml; + }; + + gnomeicontheme = (import ./gnome-icon-theme) { + inherit fetchurl stdenv pkgconfig perl perlXMLParser; + input = desktop.gnomeicontheme; + }; + + gnomekeyring = (import ./gnome-keyring) { + inherit fetchurl stdenv pkgconfig glib gtk; + input = desktop.gnomekeyring; + }; }
\ No newline at end of file diff --git a/pkgs/development/libraries/gnome/esound/default.nix b/pkgs/development/libraries/gnome/esound/default.nix index e6eff85eaf0d..eb3727bc1c2a 100644 --- a/pkgs/development/libraries/gnome/esound/default.nix +++ b/pkgs/development/libraries/gnome/esound/default.nix @@ -1,12 +1,8 @@ -{stdenv, fetchurl, audiofile}: +{input, stdenv, fetchurl, audiofile}: assert audiofile != null; stdenv.mkDerivation { - name = "esound-0.2.32"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/esound-0.2.32.tar.bz2; - md5 = "b2a5e71ec8220fea1c22cc042f5f6e63"; - }; + inherit (input) name src; propagatedBuildInputs = [audiofile]; } diff --git a/pkgs/development/libraries/gnome/gail/default.nix b/pkgs/development/libraries/gnome/gail/default.nix new file mode 100644 index 000000000000..2957aa90de58 --- /dev/null +++ b/pkgs/development/libraries/gnome/gail/default.nix @@ -0,0 +1,7 @@ +{input, stdenv, fetchurl, pkgconfig, atk, gtk, libgnomecanvas}: + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig atk gtk libgnomecanvas]; + propagatedBuildInputs = [libgnomecanvas]; +} diff --git a/pkgs/development/libraries/gnome/glib/default.nix b/pkgs/development/libraries/gnome/glib/default.nix new file mode 100644 index 000000000000..91e155f67d74 --- /dev/null +++ b/pkgs/development/libraries/gnome/glib/default.nix @@ -0,0 +1,8 @@ +{input, stdenv, fetchurl, pkgconfig, gettext, perl}: + +assert pkgconfig != null && gettext != null && perl != null; + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig gettext perl]; +} diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix b/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix new file mode 100644 index 000000000000..b96da831b84a --- /dev/null +++ b/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix @@ -0,0 +1,13 @@ +{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}: + +assert pkgconfig != null && perl != null; + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig perl perlXMLParser]; + + # TODO: maybe this package as dependency on gnome-themes? + configureFlags = "--disable-hicolor-check"; + + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; +} diff --git a/pkgs/development/libraries/gnome/gnome-keyring/default.nix b/pkgs/development/libraries/gnome/gnome-keyring/default.nix new file mode 100644 index 000000000000..d781cbbb523e --- /dev/null +++ b/pkgs/development/libraries/gnome/gnome-keyring/default.nix @@ -0,0 +1,9 @@ +# gnome-keyring + +{input, stdenv, fetchurl, pkgconfig, glib, gtk}: + +stdenv.mkDerivation { + inherit (input) name src; + buildInputs = [pkgconfig gtk glib]; + CFLAGS = "-DENABLE_NLS=0"; +} diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix index 4d82b6fec970..1b423283e13d 100644 --- a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix +++ b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix @@ -1,12 +1,11 @@ -{stdenv, fetchurl, pkgconfig, perl}: +{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser}: assert pkgconfig != null && perl != null; stdenv.mkDerivation { - name = "gnome-mime-data-2.4.0"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-mime-data-2.4.0.tar.bz2; - md5 = "b8f1b383a23d734bec8bc33a03cb3690"; - }; - buildInputs = [pkgconfig perl]; + inherit (input) name src; + buildInputs = [pkgconfig perl perlXMLParser]; + + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; } + diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/development/libraries/gnome/gnome-vfs/default.nix index d6efbb409424..3e3f46a9abe3 100644 --- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix +++ b/pkgs/development/libraries/gnome/gnome-vfs/default.nix @@ -1,18 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf +{input, stdenv, fetchurl, pkgconfig, perl, glib, libxml2, gconf , libbonobo, gnomemimedata, popt, bzip2, perlXMLParser }: assert pkgconfig != null && perl != null && glib != null - && libxml2 != null && GConf != null && libbonobo != null + && libxml2 != null && gconf != null && libbonobo != null && gnomemimedata != null && bzip2 != null; stdenv.mkDerivation { - name = "gnome-vfs-2.4.2"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnome-vfs-2.4.2.tar.bz2; - md5 = "a0f0e40739214143bbf3050311ff10cd"; - }; + inherit (input) name src; buildInputs = [ - pkgconfig perl glib libxml2 GConf libbonobo + pkgconfig perl glib libxml2 gconf libbonobo gnomemimedata popt bzip2 perlXMLParser ]; PERL5LIB = perlXMLParser ~ "/lib/site_perl"; diff --git a/pkgs/development/libraries/gnome/gtk+/default.nix b/pkgs/development/libraries/gnome/gtk+/default.nix new file mode 100644 index 000000000000..3ffdd4517c24 --- /dev/null +++ b/pkgs/development/libraries/gnome/gtk+/default.nix @@ -0,0 +1,17 @@ +{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; +} diff --git a/pkgs/development/libraries/gnome/gtkhtml/default.nix b/pkgs/development/libraries/gnome/gtkhtml/default.nix new file mode 100644 index 000000000000..0ec09f86c24a --- /dev/null +++ b/pkgs/development/libraries/gnome/gtkhtml/default.nix @@ -0,0 +1,28 @@ +{input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, atk, gail, gtk, + libgnomeprint, libgnomeprintui, libgnomeui, libglade, gnomeicontheme, libjpeg}: + +# TODO build complains about missing libsoup and soup. Optional dependency? + +assert + null != pkgconfig + && null != perl + && null != perlXMLParser + && null != pkgconfig + && null != atk + && null != gail + && null != gtk + ; + +stdenv.mkDerivation { + inherit (input) name src; + + buildInputs = [ + perl perlXMLParser pkgconfig libjpeg + atk gail gtk + libglade libgnomeprint libgnomeprintui libgnomeui + gnomeicontheme + ]; + + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; +} + diff --git a/pkgs/development/libraries/gnome/libIDL/default.nix b/pkgs/development/libraries/gnome/libIDL/default.nix index 9d6ad61621d3..2a2dd49e2d16 100644 --- a/pkgs/development/libraries/gnome/libIDL/default.nix +++ b/pkgs/development/libraries/gnome/libIDL/default.nix @@ -1,12 +1,8 @@ -{stdenv, fetchurl, pkgconfig, glib, lex, yacc}: +{input, stdenv, fetchurl, pkgconfig, glib, lex, yacc}: assert pkgconfig != null && glib != null && lex != null && yacc != null; stdenv.mkDerivation { - name = "libIDL-0.8.2"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libIDL-0.8.2.tar.bz2; - md5 = "a75d2dbf3a3c66b567047c94245f8b82"; - }; + inherit (input) name src; buildInputs = [pkgconfig glib lex yacc]; } diff --git a/pkgs/development/libraries/gnome/libart_lgpl/default.nix b/pkgs/development/libraries/gnome/libart_lgpl/default.nix index fa388c2d2ff0..4f05f788b4d8 100644 --- a/pkgs/development/libraries/gnome/libart_lgpl/default.nix +++ b/pkgs/development/libraries/gnome/libart_lgpl/default.nix @@ -1,9 +1,5 @@ -{stdenv, fetchurl}: +{input, stdenv, fetchurl}: stdenv.mkDerivation { - name = "libart_lgpl-2.3.16"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libart_lgpl-2.3.16.tar.bz2; - md5 = "6bb13292b00649d01400a5b29a6c87cb"; - }; + inherit (input) name src; } diff --git a/pkgs/development/libraries/gnome/libbonobo/default.nix b/pkgs/development/libraries/gnome/libbonobo/default.nix index dee3191f8e3c..d50e505b2b74 100644 --- a/pkgs/development/libraries/gnome/libbonobo/default.nix +++ b/pkgs/development/libraries/gnome/libbonobo/default.nix @@ -1,14 +1,12 @@ -{stdenv, fetchurl, pkgconfig, perl, ORBit2, libxml2, popt, yacc, flex}: +{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, ORBit2, libxml2, popt, yacc, flex}: assert pkgconfig != null && perl != null && ORBit2 != null && libxml2 != null && popt != null && yacc != null && flex != null; +# todo 2.8.1 doesn;t work stdenv.mkDerivation { - name = "libbonobo-2.4.2"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonobo-2.4.2.tar.bz2; - md5 = "78200cc6ed588c93f0d29177a5f3e003"; - }; + inherit (input) name src; buildInputs = [pkgconfig perl libxml2 yacc flex]; propagatedBuildInputs = [ORBit2 popt]; + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; } diff --git a/pkgs/development/libraries/gnome/libbonoboui/default.nix b/pkgs/development/libraries/gnome/libbonoboui/default.nix index d74d3a469698..51263a330758 100644 --- a/pkgs/development/libraries/gnome/libbonoboui/default.nix +++ b/pkgs/development/libraries/gnome/libbonoboui/default.nix @@ -1,15 +1,16 @@ -{stdenv, fetchurl, pkgconfig, perl, libxml2, libglade, libgnome +{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome , libgnomecanvas}: assert pkgconfig != null && perl != null && libxml2 != null && libglade != null && libgnome != null && libgnomecanvas != null; +# todo 2.8.1 doesn;t work stdenv.mkDerivation { - name = "libbonoboui-2.4.1"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libbonoboui-2.4.1.tar.bz2; - md5 = "943a2d0e9fc7b9f0e97ba869de0c5f2a"; - }; + inherit (input) name src; buildInputs = [pkgconfig perl libglade]; propagatedBuildInputs = [libxml2 libgnome libgnomecanvas]; + + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; + + LDFLAGS="-lglib-2.0"; } diff --git a/pkgs/development/libraries/gnome/libglade/default.nix b/pkgs/development/libraries/gnome/libglade/default.nix index ec4d5bb1cc63..2719379359c8 100644 --- a/pkgs/development/libraries/gnome/libglade/default.nix +++ b/pkgs/development/libraries/gnome/libglade/default.nix @@ -1,13 +1,9 @@ -{stdenv, fetchurl, pkgconfig, gtk, libxml2}: +{input, stdenv, fetchurl, pkgconfig, gtk, libxml2}: assert pkgconfig != null && gtk != null && libxml2 != null; stdenv.mkDerivation { - name = "libglade-2.0.1"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libglade-2.0.1.tar.bz2; - md5 = "4d93f6b01510013ae429e91af432cfe2"; - }; + inherit (input) name src; buildInputs = [pkgconfig]; propagatedBuildInputs = [gtk libxml2]; } diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/development/libraries/gnome/libgnome/default.nix index 676a77690529..34a1ff8a339b 100644 --- a/pkgs/development/libraries/gnome/libgnome/default.nix +++ b/pkgs/development/libraries/gnome/libgnome/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, gnomevfs, libbonobo -, GConf, popt, zlib }: +{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gnomevfs, libbonobo +, gconf, popt, zlib }: assert pkgconfig != null && perl != null && glib != null - && gnomevfs != null && libbonobo != null && GConf != null + && gnomevfs != null && libbonobo != null && gconf != null && popt != null && zlib != null; -# !!! TO CHECK: +# !!! TODO CHECK: # libgnome tries to install stuff into GConf (which fails): # "WARNING: failed to install schema `/schemas/desktop/gnome/url-handlers/https/need-terminal' locale `is': Failed: # Failed to create file `/nix/store/14d4fc76451786eba9dea087d56dc719-GConf-2.4.0/etc/gconf/gconf.xml.defaults/%gconf.xml': Permission denied" stdenv.mkDerivation { - name = "libgnome-2.0.6"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnome-2.4.0.tar.bz2; - md5 = "caec1e12d64b98a2925a4317ac16429f"; - }; - buildInputs = [pkgconfig perl popt zlib]; - propagatedBuildInputs = [glib gnomevfs libbonobo GConf]; + inherit (input) name src; + buildInputs = [pkgconfig perl perlXMLParser popt zlib]; + propagatedBuildInputs = [glib gnomevfs libbonobo gconf]; + + PERL5LIB = perlXMLParser ~ "/lib/site_perl"; } diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix index 9abc721a24a1..6602cf43ebc5 100644 --- a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix +++ b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix @@ -1,14 +1,10 @@ -{stdenv, fetchurl, pkgconfig, gtk, libart, libglade}: +{input, stdenv, fetchurl, pkgconfig, gtk, libart, libglade}: assert pkgconfig != null && gtk != null && libart != null && libglade != null; stdenv.mkDerivation { - name = "libgnomecanvas-2.4.0"; - src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libgnomecanvas-2.4.0.tar.bz2; - md5 = "c212a7cac06b7f9e68ed2de38df6e54d"; - }; + inherit (input) name src; buildInputs = [pkgconfig libglade]; propagatedBuildInputs = [gtk libart]; } diff --git a/pkgs/development/libraries/gnome/libgnomeprint/default.nix b/pkgs/development/libraries/gnome/li |