gnome3.gnome-shell: fix build

pkgs/desktops/gnome-3/core/gnome-shell/default.nix

@@ -1,10 +1,10 @@
-{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
+{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
-, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales
+, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
-, sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
+, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
-, gst_all_1 }:
+, sassc, systemd, gst_all_1 }:
 
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
@@ -25,20 +25,24 @@ in stdenv.mkDerivation rec {
 
   LANG = "en_US.UTF-8";
 
-  nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];
+  nativeBuildInputs = [
-  buildInputs = with gnome3;
+    meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
-    [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice
+    sassc
-      libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf librsvg
+  ];
-      clutter networkmanager libstartup_notification telepathy-glib
+  buildInputs = with gnome3; [
-      libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server
+    systemd caribou
-      libical nss gtk gstreamer gdm
+    gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
-      libcanberra-gtk3 gnome-control-center geoclue2
+    libcroco libsecret libsoup polkit gdk_pixbuf librsvg
-      defaultIconTheme sqlite gnome3.gnome-bluetooth
+    clutter networkmanager libstartup_notification telepathy-glib
-      libgweather # not declared at build time, but typelib is needed at runtime
+    libXtst gjs mutter libpulseaudio evolution-data-server
-      gnome3.gnome-clocks # schemas needed
+    libical gtk gstreamer gdm libcanberra-gtk3 geoclue2
-      at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
+    defaultIconTheme gnome3.gnome-bluetooth
-      gst_all_1.gst-plugins-good # recording
+    libgweather # not declared at build time, but typelib is needed at runtime
-      gobjectIntrospection (stdenv.lib.getLib dconf) ];
+    gnome3.gnome-clocks # schemas needed
+    at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
+    gst_all_1.gst-plugins-good # recording
+    gobjectIntrospection
+  ];
   propagatedUserEnvPkgs = [
     # Needed to support on-screen keyboard used with touch screen devices
     # see https://github.com/NixOS/nixpkgs/issues/25968
@@ -51,7 +55,10 @@ in stdenv.mkDerivation rec {
       url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016;
       sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm";
     })
-    ./fix-paths.patch
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit unzip;
+    })
   ];
 
   postPatch = ''
@@ -59,23 +66,34 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
     substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
-    substituteInPlace js/ui/extensionDownloader.js --replace "unzip" "${unzip}/bin/unzip"
   '';
 
   postInstall = ''
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  enableParallelBuilding = true;
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # Until glib’s xdgmime is patched
+      # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+    )
+  '';
 
   passthru = {
     mozillaPlugin = "/lib/mozilla/plugins";
-    updateScript = gnome3.updateScript { packageName = "gnome-shell"; attrPath = "gnome3.gnome-shell"; };
+    updateScript = gnome3.updateScript {
+      packageName = "gnome-shell";
+      attrPath = "gnome3.gnome-shell";
+    };
   };
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    description = "Core user interface for the GNOME 3 desktop";
+    homepage = https://wiki.gnome.org/Projects/GnomeShell;
+    license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 
 }

pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch

@@ -1,18 +1,11 @@
-diff --git a/meson.build b/meson.build
+--- a/js/ui/extensionDownloader.js
-index 4c1f5c63b..a9edb8795 100644
++++ b/js/ui/extensionDownloader.js
---- a/meson.build
+@@ -86,7 +86,7 @@
-+++ b/meson.build
+     stream.output_stream.write_bytes(contents, null);
-@@ -59,12 +59,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services')
+     stream.close(null);
- 
+     let [success, pid] = GLib.spawn_async(null,
- plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir)
+-                                          ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
- 
++                                          ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()],
--keybindings_dep = dependency('gnome-keybindings', required: false)
+                                           null,
--if keybindings_dep.found()
+                                           GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
--  keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
+                                           null);
--else
--  keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
--endif
-+keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
- 
- atk_bridge_dep = dependency('atk-bridge-2.0')
- canberra_dep = dependency('libcanberra')