summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2018-04-03 14:17:50 +0200
committerTor Hedin Brønner <torhedinbronner@gmail.com>2018-04-03 16:10:23 +0200
commit43ce9b93f5368edf60d5535ae0d1eef1a76fa68e (patch)
tree983d637bc7d4c860635f7905936470e781e6b483 /pkgs/desktops/gnome-3
parent1661e88e8261fc7ccdb271cabd453b62952f2fc9 (diff)
downloadnixlib-43ce9b93f5368edf60d5535ae0d1eef1a76fa68e.tar
nixlib-43ce9b93f5368edf60d5535ae0d1eef1a76fa68e.tar.gz
nixlib-43ce9b93f5368edf60d5535ae0d1eef1a76fa68e.tar.bz2
nixlib-43ce9b93f5368edf60d5535ae0d1eef1a76fa68e.tar.lz
nixlib-43ce9b93f5368edf60d5535ae0d1eef1a76fa68e.tar.xz
nixlib-43ce9b93f5368edf60d5535ae0d1eef1a76fa68e.tar.zst
nixlib-43ce9b93f5368edf60d5535ae0d1eef1a76fa68e.zip
gnome3.gnome-shell-extensions: let apps-menu know about gnome-menus
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix10
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch24
2 files changed, 33 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index c6bf38992b5d..7ba3545848f7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib
+, gnome3, substituteAll }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${version}";
@@ -16,6 +17,13 @@ stdenv.mkDerivation rec {
     };
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix_gmenu.patch;
+      gmenu_path = "${gnome3.gnome-menus}/lib/girepository-1.0";
+    })
+  ];
+
   doCheck = true;
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch
new file mode 100644
index 000000000000..c384826de617
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch
@@ -0,0 +1,24 @@
+From f72924a59d4a30daefccf84526bd854ebbe65ac8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
+Date: Tue, 3 Apr 2018 14:13:12 +0200
+Subject: [PATCH] Fix gmenu typelib path
+
+---
+ extensions/apps-menu/extension.js | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
+index 5b38213..d706f64 100644
+--- a/extensions/apps-menu/extension.js
++++ b/extensions/apps-menu/extension.js
+@@ -1,5 +1,7 @@
+ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+ 
++imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@');
++
+ const Atk = imports.gi.Atk;
+ const DND = imports.ui.dnd;
+ const GMenu = imports.gi.GMenu;
+-- 
+2.16.2
+