summary refs log tree commit diff
path: root/pkgs/desktops/gnome-2
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-07-10 00:02:06 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-07-10 12:14:40 +0200
commit373bdced7fa570d83695b83a5db939a180d290b9 (patch)
tree9501afe6b3f52f8b08565ccdd8a7a5f5251437a5 /pkgs/desktops/gnome-2
parent301559c1ea694092a92d72220d3ed4e09cbcd8c1 (diff)
downloadnixpkgs-373bdced7fa570d83695b83a5db939a180d290b9.tar
nixpkgs-373bdced7fa570d83695b83a5db939a180d290b9.tar.gz
nixpkgs-373bdced7fa570d83695b83a5db939a180d290b9.tar.bz2
nixpkgs-373bdced7fa570d83695b83a5db939a180d290b9.tar.lz
nixpkgs-373bdced7fa570d83695b83a5db939a180d290b9.tar.xz
nixpkgs-373bdced7fa570d83695b83a5db939a180d290b9.tar.zst
nixpkgs-373bdced7fa570d83695b83a5db939a180d290b9.zip
gnome2.GConf: 2.32.4 → 3.2.6
Update and clean up the expression. For example, GTK was only used for
removed utility and examples.
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r--pkgs/desktops/gnome-2/platform/GConf/default.nix30
1 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index 778a1cc920f..afba6e15ebd 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -1,29 +1,33 @@
 { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
-, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }:
+, polkit, intltool }:
 
-assert withGtk -> (gtk2 != null);
-
-stdenv.mkDerivation {
-  name = "gconf-2.32.4";
+stdenv.mkDerivation rec {
+  name = "gconf-${version}";
+  version = "3.2.6";
 
   src = fetchurl {
-    url = mirror://gnome/sources/GConf/2.32/GConf-2.32.4.tar.xz;
-    sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
+    url = "mirror://gnome/sources/GConf/${stdenv.lib.versions.majorMinor version}/GConf-${version}.tar.xz";
+    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
   };
 
   outputs = [ "out" "dev" "man" ];
 
-  buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ]
+  buildInputs = [ ORBit2 libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
-    ++ stdenv.lib.optional (!stdenv.isDarwin) polkit
-    ++ stdenv.lib.optional withGtk gtk2;
+    ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;
 
-  propagatedBuildInputs = [ glib ];
+  propagatedBuildInputs = [ glib dbus-glib ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  configureFlags = stdenv.lib.optional withGtk "--with-gtk=2.0"
+  configureFlags =
     # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin
-    ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
+    stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://projects.gnome.org/gconf/;
+    description = "Deprecated system for storing application preferences";
+    platforms = platforms.linux;
+  };
 }