Merge pull request #217001 from tobim/pkgs/easyscreencast-1.7.0

gnomeExtensions.EasyScreenCast: 1.4.0 -> 1.7.0

2 files changed, 39 insertions, 15 deletions

diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
index 29a60e5513af2..759fd1d9bfe38 100644
--- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-EasyScreenCast";
-  version = "1.4.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "EasyScreenCast";
     repo = "EasyScreenCast";
     rev = version;
-    sha256 = "sha256-+lh/hqYC9+DUvLE016KuAY4Ybw8KrqEEG7WG4pUbg2k=";
+    hash = "sha256-+cH/gczCdxoSrLp5nD82Spo8bSGyRnUUut3Xkmr9f3o=";
   };
 
   patches = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    glib gettext
+    glib gettext jq
   ];
 
   makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch
index 2d32021b6c665..4ea048ba79bf2 100644
--- a/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch
@@ -1,16 +1,40 @@
-diff --git i/utilaudio.js w/utilaudio.js
-index 983b29c..7a94de8 100644
---- i/utilaudio.js
-+++ w/utilaudio.js
-@@ -11,10 +11,7 @@
- */
+diff --git a/prefs.js b/prefs.js
+index 97b85a3..2fc6539 100644
+--- a/prefs.js
++++ b/prefs.js
+@@ -14,8 +14,8 @@
+ 'use strict';
  
  const GIRepository = imports.gi.GIRepository;
--GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell");
--GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell");
--GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell");
--GIRepository.Repository.prepend_library_path("/usr/lib64/gnome-shell");
+-GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell');
+-GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell');
++GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell');
++GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell');
+ 
+ const GObject = imports.gi.GObject;
+ const Gio = imports.gi.Gio;
+@@ -746,7 +746,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({
+                 Lib.TalkativeLog('-^-NOT SET xdg-user video');
+ 
+                 ctx.CtrlExe.Execute(
+-                    '/usr/bin/sh -c "echo $HOME"',
++                    '/bin/sh -c "echo $HOME"',
+                     true,
+                     (success, out) => {
+                         Lib.TalkativeLog(`-^-CALLBACK sync S: ${success} out: ${out}`);
+diff --git a/utilaudio.js b/utilaudio.js
+index 957eda2..84af241 100644
+--- a/utilaudio.js
++++ b/utilaudio.js
+@@ -15,10 +15,7 @@
+ 
+ const GObject = imports.gi.GObject;
+ const GIRepository = imports.gi.GIRepository;
+-GIRepository.Repository.prepend_search_path('/usr/lib/gnome-shell');
+-GIRepository.Repository.prepend_library_path('/usr/lib/gnome-shell');
+-GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell');
+-GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell');
 +GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell");
  const Gvc = imports.gi.Gvc;
- const Lang = imports.lang;
  
+ const ExtensionUtils = imports.misc.extensionUtils;