diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 20:09:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 20:09:10 +0100 |
| commit | 99bc034a04fa91a6c52ea54197297e31bb5bbf7d (patch) | |
| tree | 0957bbee1d3a332386d15c852c07e33446dfa669 /pkgs/desktops | |
| parent | 4b3e2531c965947e823e085f083ef4d81929ca31 (diff) | |
| download | nixlib-99bc034a04fa91a6c52ea54197297e31bb5bbf7d.tar nixlib-99bc034a04fa91a6c52ea54197297e31bb5bbf7d.tar.gz nixlib-99bc034a04fa91a6c52ea54197297e31bb5bbf7d.tar.bz2 nixlib-99bc034a04fa91a6c52ea54197297e31bb5bbf7d.tar.lz nixlib-99bc034a04fa91a6c52ea54197297e31bb5bbf7d.tar.xz nixlib-99bc034a04fa91a6c52ea54197297e31bb5bbf7d.tar.zst nixlib-99bc034a04fa91a6c52ea54197297e31bb5bbf7d.zip | |
gnome3.gconf: migrate
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gconf/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index cfe2b2e44659..9ca9c227d586 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, libxml2 -, intltool, dbus_libs, polkit }: +{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2 +, intltool, polkit, orbit }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { moduleName = "GConf"; origName = "${moduleName}-${versionMajor}.${versionMinor}"; - + name = "gconf-${versionMajor}.${versionMinor}"; src = fetchurl { @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd"; }; - buildInputs = [ dbus_libs dbus_glib libxml2 polkit gnome3.gtk ]; - propagatedBuildInputs = [ gnome3.glib ]; - buildNativeInputs = [ pkgconfig intltool ]; + buildInputs = [ libxml2 polkit gtk orbit ]; + propagatedBuildInputs = [ glib dbus_glib ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + # ToDo: ldap reported as not found but afterwards reported as supported + + meta = { + homepage = http://projects.gnome.org/gconf/; + description = "A system for storing application preferences"; + }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index ccd827b8d5db..9d2ecdba476b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, GConf3 }: +, gnome_doc_utils, intltool, libX11, which, gconf }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte GConf3 ]; + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte gconf ]; buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ]; } |