From 69698ec11cc0619d84b14764fa9e708fe7e7223c Mon Sep 17 00:00:00 2001
From: Jan Tojnar
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`.
---
 pkgs/desktops/gnome-3/core/gjs/default.nix | 25 +++++++++++++++++++++++++
 pkgs/desktops/gnome-3/core/gjs/src.nix     | 10 ++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gjs/default.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gjs/src.nix

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

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
new file mode 100644
index 000000000000..10d9c46123dd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
+, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
+
+stdenv.mkDerivation rec {
+  inherit (import ./src.nix fetchurl) name src;
+
+  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
+
+  propagatedBuildInputs = [ spidermonkey_38 ];
+
+  # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
+  preConfigure = ''
+    sed -i s/mozjs-38/js/ configure
+  '';
+
+  postInstall = ''
+    sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
+  '';
+
+  meta = with stdenv.lib; {
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix
new file mode 100644
index 000000000000..27162fcbfd45
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gjs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gjs-1.48.6";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz;
+    sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312";
+  };
+}
-- 
cgit 1.4.1