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

gnome3.gconf: migrate

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-21 20:09:10 +01:00
parent 4b3e2531c9
commit 99bc034a04
5 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/desktops/gnome-3/core/gconf/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, libxml2 { stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2
, intltool, dbus_libs, polkit }: , intltool, polkit, orbit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
moduleName = "GConf"; moduleName = "GConf";
origName = "${moduleName}-${versionMajor}.${versionMinor}"; origName = "${moduleName}-${versionMajor}.${versionMinor}";
name = "gconf-${versionMajor}.${versionMinor}"; name = "gconf-${versionMajor}.${versionMinor}";
src = fetchurl { src = fetchurl {
@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd"; sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd";
}; };
buildInputs = [ dbus_libs dbus_glib libxml2 polkit gnome3.gtk ]; buildInputs = [ libxml2 polkit gtk orbit ];
propagatedBuildInputs = [ gnome3.glib ]; propagatedBuildInputs = [ glib dbus_glib ];
buildNativeInputs = [ pkgconfig intltool ]; 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";
};
} }

4
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango { 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 { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
configureFlags = "--disable-scrollkeeper"; 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 ]; buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ];
} }

23
pkgs/development/libraries/GConf/3.x.nix
View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, glib, dbus_glib, pkgconfig, libxml2, gtk3, intltool, polkit }:
stdenv.mkDerivation {
name = "GConf-3.2.3";
src = fetchurl {
url = mirror://gnome/sources/GConf/3.2/GConf-3.2.3.tar.xz;
sha256 = "0jd1z9gb1b7mv4g07qm554va6idasf3swgrfqflypdh9s38mvdcy";
};
propagatedBuildInputs = [ glib dbus_glib ];
buildInputs = [ polkit gtk3 libxml2 ];
nativeBuildInputs = [ pkgconfig intltool ];
configureFlags = "--disable-orbit";
meta = {
homepage = http://projects.gnome.org/gconf/;
description = "A system for storing application preferences";
maintainers = [ stdenv.lib.maintainers.urkud ];
inherit (gtk3.meta) platforms;
};
}

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

@ -3636,8 +3636,6 @@ let
gav = callPackage ../games/gav { }; gav = callPackage ../games/gav { };
GConf3 = callPackage ../development/libraries/GConf/3.x.nix { };
gdome2 = callPackage ../development/libraries/gdome2 { gdome2 = callPackage ../development/libraries/gdome2 {
inherit (gnome) gtkdoc; inherit (gnome) gtkdoc;
}; };

1
pkgs/top-level/release-python.nix
View File

@ -374,7 +374,6 @@ in
gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
GConf3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };