From 69698ec11cc0619d84b14764fa9e708fe7e7223c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 24 Sep 2017 13:15:50 +0200
Subject: gnome3: only maintain single GNOME 3 package set (#29397)

* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.
---
 .../gnome-3/core/gnome-disk-utility/default.nix    | 29 ++++++++++++++++++++++
 .../gnome-3/core/gnome-disk-utility/src.nix        | 10 ++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix

(limited to 'pkgs/desktops/gnome-3/core/gnome-disk-utility')

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
new file mode 100644
index 000000000000..aef58567387b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
+, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify
+, itstool, gnome3, gdk_pixbuf, libxml2, python
+, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
+
+stdenv.mkDerivation rec {
+  inherit (import ./src.nix fetchurl) name src;
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  libxslt libtool libsecret libpwquality cracklib
+                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
+                  gdk_pixbuf gnome3.defaultIconTheme
+                  udisks2 gnome3.gnome_settings_daemon
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
+    description = "A udisks graphical front-end";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
new file mode 100644
index 000000000000..602b9eb340e4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-disk-utility-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz;
+    sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1";
+  };
+}
-- 
cgit 1.4.1