Unverified Commit 5e9bcb93 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

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

gnomeExtensions.EasyScreenCast: 1.4.0 -> 1.7.0
parents 6cc874ee f305cd10

pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix

+4 −4
Original line number Diff line number Diff line 
{ 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" ];

pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch

+35 −11
Original line number Diff line number Diff line 
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;