Author: urkud
Date: Sat Mar 17 16:46:02 2012
New Revision: 33201
URL: https://nixos.org/websvn/nix/?rev=33201&sc=1
Log:
Move gnome3.GConf to GConf3
Added:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/GConf/
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/GConf/3.x.nix
Deleted:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/platform/GConf.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix Sat Mar
17 16:45:56 2012 (r33200)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-3/default.nix Sat Mar
17 16:46:02 2012 (r33201)
@@ -3,7 +3,5 @@
{
clutter = callPackage ./platform/clutter.nix { };
- GConf = callPackage ./platform/GConf.nix { };
-
gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
}
Added: nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/GConf/3.x.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/GConf/3.x.nix
Sat Mar 17 16:46:02 2012 (r33201)
@@ -0,0 +1,23 @@
+{ 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 ];
+ buildNativeInputs = [ 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;
+ };
+}
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sat Mar
17 16:45:56 2012 (r33200)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sat Mar
17 16:46:02 2012 (r33201)
@@ -3463,6 +3463,8 @@
gav = callPackage ../games/gav { };
+ GConf3 = callPackage ../development/libraries/GConf/3.x.nix { };
+
gdome2 = callPackage ../development/libraries/gdome2 {
inherit (gnome) gtkdoc;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
