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

* gconf-editor and various dependencies.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8171
This commit is contained in:
Eelco Dolstra 2007-03-04 21:28:24 +00:00
parent 69b62bf2d6
commit 295990ca07
11 changed files with 110 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/desktops/gnome/default.nix
View File

@ -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

14
pkgs/desktops/gnome/gconf-editor.nix Normal file
View File

@ -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";
}

14
pkgs/desktops/gnome/gnome-doc-utils.nix Normal file
View File

@ -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";
}

14
pkgs/desktops/gnome/gnome-vfs.nix
View File

@ -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";
}

8
pkgs/desktops/gnome/libgnome.nix
View File

@ -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];
}

17
pkgs/desktops/gnome/libgnomeui.nix
View File

@ -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
];
}

12
pkgs/development/libraries/dbus-glib/default.nix Normal file
View File

@ -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];
}

11
pkgs/development/libraries/dbus/default.nix Normal file
View File

@ -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";
}

5
pkgs/development/libraries/imlib/default.nix
View File

@ -14,8 +14,3 @@ stdenv.mkDerivation {
buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];
}

12
pkgs/top-level/all-packages.nix
View File

@ -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 {

1
pkgs/top-level/build-for-release.nix
View File

@ -195,6 +195,7 @@ let {
;
inherit ((allPackages {system = "i686-linux";}).gnome)
metacity
gconfeditor
;
};