nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 12:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
gnomeExtensions.EasyScreenCast: 1.4.0 -> 1.7.0
This commit is contained in:
Doron Behar 2023-02-20 09:59:57 +02:00 committed by GitHub
commit 5e9bcb9338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }: { lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-EasyScreenCast"; pname = "gnome-shell-extension-EasyScreenCast";
version = "1.4.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EasyScreenCast"; owner = "EasyScreenCast";
repo = "EasyScreenCast"; repo = "EasyScreenCast";
rev = version; rev = version;
sha256 = "sha256-+lh/hqYC9+DUvLE016KuAY4Ybw8KrqEEG7WG4pUbg2k="; hash = "sha256-+cH/gczCdxoSrLp5nD82Spo8bSGyRnUUut3Xkmr9f3o=";
}; };
patches = [ patches = [
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
glib gettext glib gettext jq
]; ];
makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];

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

@ -1,16 +1,40 @@
diff --git i/utilaudio.js w/utilaudio.js diff --git a/prefs.js b/prefs.js
index 983b29c..7a94de8 100644 index 97b85a3..2fc6539 100644
--- i/utilaudio.js --- a/prefs.js
+++ w/utilaudio.js +++ b/prefs.js
@@ -11,10 +11,7 @@ @@ -14,8 +14,8 @@
*/ 'use strict';
const GIRepository = imports.gi.GIRepository; const GIRepository = imports.gi.GIRepository;
-GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell"); -GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell');
-GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell"); -GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell');
-GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell"); +GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell');
-GIRepository.Repository.prepend_library_path("/usr/lib64/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"); +GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell");
const Gvc = imports.gi.Gvc; const Gvc = imports.gi.Gvc;
const Lang = imports.lang;
const ExtensionUtils = imports.misc.extensionUtils;