From 295990ca07eac639f47f3f431b843d19700860b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 4 Mar 2007 21:28:24 +0000 Subject: * gconf-editor and various dependencies. svn path=/nixpkgs/trunk/; revision=8171 --- pkgs/desktops/gnome/default.nix | 35 ++++++++++++++++++------ pkgs/desktops/gnome/gconf-editor.nix | 14 ++++++++++ pkgs/desktops/gnome/gnome-doc-utils.nix | 14 ++++++++++ pkgs/desktops/gnome/gnome-vfs.nix | 14 ++++------ pkgs/desktops/gnome/libgnome.nix | 8 +++--- pkgs/desktops/gnome/libgnomeui.nix | 17 +++++++----- pkgs/development/libraries/dbus-glib/default.nix | 12 ++++++++ pkgs/development/libraries/dbus/default.nix | 11 ++++++++ pkgs/development/libraries/imlib/default.nix | 5 ---- pkgs/top-level/all-packages.nix | 12 +++++++- pkgs/top-level/build-for-release.nix | 1 + 11 files changed, 110 insertions(+), 33 deletions(-) create mode 100644 pkgs/desktops/gnome/gconf-editor.nix create mode 100644 pkgs/desktops/gnome/gnome-doc-utils.nix create mode 100644 pkgs/development/libraries/dbus-glib/default.nix create mode 100644 pkgs/development/libraries/dbus/default.nix (limited to 'pkgs') diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 967e9f1c7e9..b56e71d525f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -3,9 +3,13 @@ { stdenv, fetchurl, pkgconfig, audiofile , flex, bison, popt, perl, zlib, libxml2, libxslt , perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg -, libpng, gtkLibs, xlibs, bzip2, libcm +, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib }: +assert dbus_glib.glib == gtkLibs.glib; + +let gnome = + rec { # Platform @@ -50,8 +54,8 @@ rec { }; gnomevfs = import ./gnome-vfs.nix { - inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf - libbonobo gnomemimedata popt perlXMLParser gettext bzip2; + inherit fetchurl stdenv gnome pkgconfig perl libxml2 popt + perlXMLParser gettext bzip2 dbus_glib; input = platform.gnomevfs; }; @@ -62,8 +66,8 @@ rec { }; libgnome = import ./libgnome.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gnomevfs - libbonobo GConf popt zlib esound; + inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser + popt zlib esound gettext; input = platform.libgnome; }; @@ -96,8 +100,8 @@ rec { }; libgnomeui = import ./libgnomeui.nix { - inherit fetchurl stdenv pkgconfig libgnome libgnomecanvas - libbonoboui libglade libjpeg esound gnomekeyring; + inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser + libjpeg esound gettext; input = platform.libgnomeui; }; @@ -195,5 +199,20 @@ rec { enableCompositor = true; input = desktop.metacity; }; + + gnomedocutils = import ./gnome-doc-utils.nix { + inherit stdenv fetchurl pkgconfig perl perlXMLParser python + libxml2 libxslt gettext; + input = desktop.gnomedocutils; + }; + + gconfeditor = import ./gconf-editor.nix { + inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser + gettext libxslt; + input = desktop.gconfeditor; + }; -} +}; + +in gnome + diff --git a/pkgs/desktops/gnome/gconf-editor.nix b/pkgs/desktops/gnome/gconf-editor.nix new file mode 100644 index 00000000000..1da67ae0598 --- /dev/null +++ b/pkgs/desktops/gnome/gconf-editor.nix @@ -0,0 +1,14 @@ +{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser +, gettext, libxslt +}: + +stdenv.mkDerivation { + inherit (input) name src; + + buildInputs = [ + pkgconfig perl perlXMLParser gnome.GConf gnome.gnomedocutils + gnome.gtk gnome.libgnome gnome.libgnomeui gettext libxslt + ]; + + configureFlags = "--disable-scrollkeeper"; +} diff --git a/pkgs/desktops/gnome/gnome-doc-utils.nix b/pkgs/desktops/gnome/gnome-doc-utils.nix new file mode 100644 index 00000000000..47d211be0cb --- /dev/null +++ b/pkgs/desktops/gnome/gnome-doc-utils.nix @@ -0,0 +1,14 @@ +{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, python +, libxml2, libxslt, gettext +}: + +stdenv.mkDerivation { + inherit (input) name src; + + buildInputs = [ + pkgconfig perl perlXMLParser python + libxml2 libxslt gettext + ]; + + configureFlags = "--disable-scrollkeeper"; +} diff --git a/pkgs/desktops/gnome/gnome-vfs.nix b/pkgs/desktops/gnome/gnome-vfs.nix index 75f9ed77a85..b374ad4d94d 100644 --- a/pkgs/desktops/gnome/gnome-vfs.nix +++ b/pkgs/desktops/gnome/gnome-vfs.nix @@ -1,16 +1,14 @@ -{ input, stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf -, libbonobo, gnomemimedata, popt, perlXMLParser, gettext, bzip2 +{ input, stdenv, fetchurl, gnome, pkgconfig, perl, libxml2 +, popt, perlXMLParser, gettext, bzip2, dbus_glib }: -assert pkgconfig != null && perl != null && glib != null - && libxml2 != null && GConf != null && libbonobo != null - && gnomemimedata != null; - stdenv.mkDerivation { inherit (input) name src; buildInputs = [ - pkgconfig perl glib libxml2 GConf libbonobo - gnomemimedata popt perlXMLParser gettext bzip2 + pkgconfig perl gnome.glib libxml2 gnome.GConf gnome.libbonobo + gnome.gnomemimedata popt perlXMLParser gettext bzip2 + dbus_glib ]; patches = [./no-kerberos.patch]; + configureFlags = "--disable-hal"; } diff --git a/pkgs/desktops/gnome/libgnome.nix b/pkgs/desktops/gnome/libgnome.nix index dda72143bd3..2ac05487cf8 100644 --- a/pkgs/desktops/gnome/libgnome.nix +++ b/pkgs/desktops/gnome/libgnome.nix @@ -1,5 +1,5 @@ -{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gnomevfs, libbonobo -, GConf, popt, zlib, esound +{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser +, popt, zlib, esound, gettext }: # !!! TODO CHECK: @@ -9,6 +9,6 @@ stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser popt zlib esound]; - propagatedBuildInputs = [glib gnomevfs libbonobo GConf]; + buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext]; + propagatedBuildInputs = [gnome.glib gnome.gnomevfs gnome.libbonobo gnome.GConf]; } diff --git a/pkgs/desktops/gnome/libgnomeui.nix b/pkgs/desktops/gnome/libgnomeui.nix index af1d81e6984..3d014349dd9 100644 --- a/pkgs/desktops/gnome/libgnomeui.nix +++ b/pkgs/desktops/gnome/libgnomeui.nix @@ -1,11 +1,14 @@ -{input, stdenv, fetchurl, pkgconfig, libgnome, libgnomecanvas, -libbonoboui, libglade, esound, libjpeg, gnomekeyring}: - -assert pkgconfig != null && libgnome != null && libgnomecanvas != null - && libbonoboui != null && libglade != null; +{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser +, esound, libjpeg, gettext +}: stdenv.mkDerivation { inherit (input) name src; - buildInputs = [pkgconfig libglade esound libjpeg]; - propagatedBuildInputs = [libgnome libgnomecanvas libbonoboui libjpeg gnomekeyring]; + buildInputs = [ + pkgconfig perl perlXMLParser gnome.libglade esound libjpeg gettext + ]; + propagatedBuildInputs = [ + gnome.libgnome gnome.libgnomecanvas gnome.libbonoboui libjpeg + gnome.gnomekeyring + ]; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix new file mode 100644 index 00000000000..fb206f9a6f6 --- /dev/null +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, pkgconfig, gettext, dbus, glib, expat}: + +stdenv.mkDerivation { + name = "dbus-glib-0.73"; + src = fetchurl { + url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.73.tar.gz; + sha256 = "14ndjhbn6q4m7wrml8s57wghnjbm6a6fqb5jgazjxcn6748gkmyn"; + }; + inherit dbus glib; + buildInputs = [pkgconfig gettext glib expat]; + propagatedBuildInputs = [dbus]; +} diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix new file mode 100644 index 00000000000..19b625fb1ae --- /dev/null +++ b/pkgs/development/libraries/dbus/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, expat}: + +stdenv.mkDerivation { + name = "dbus-1.0.2"; + src = fetchurl { + url = http://dbus.freedesktop.org/releases/dbus/dbus-1.0.2.tar.gz; + sha256 = "1jn652zb81mczsx4rdcwrrzj3lfhx9d107zjfnasc4l5yljl204a"; + }; + buildInputs = [pkgconfig expat]; + #configureFlags = "--localstatedir=/var"; +} diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index c42ccbce167..de548d1ddb7 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -14,8 +14,3 @@ stdenv.mkDerivation { buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; } - - - - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89a70b6113e..963267fe67b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1269,6 +1269,15 @@ rec { inherit fetchurl stdenv; }; + dbus = import ../development/libraries/dbus { + inherit fetchurl stdenv pkgconfig expat; + }; + + dbus_glib = import ../development/libraries/dbus-glib { + inherit fetchurl stdenv pkgconfig gettext dbus expat; + inherit (gtkLibs) glib; + }; + dclib = import ../development/libraries/dclib { inherit fetchurl stdenv libxml2 openssl bzip2; }; @@ -3007,7 +3016,8 @@ rec { inherit fetchurl stdenv pkgconfig audiofile flex bison popt zlib libxml2 libxslt perl perlXMLParser docbook_xml_dtd_42 gettext x11 - libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm; + libtiff libjpeg libpng gtkLibs xlibs bzip2 libcm + python dbus_glib; }); kdelibs = import ../desktops/kde/kdelibs { diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 0ac68942378..8ecba0bf369 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -195,6 +195,7 @@ let { ; inherit ((allPackages {system = "i686-linux";}).gnome) metacity + gconfeditor ; }; -- cgit 1.4.1