diff options
| author | Simon Voordouw <simonvoordouw@gmail.com> | 2022-02-08 23:37:17 +0100 |
|---|---|---|
| committer | Simon Voordouw <simonvoordouw@gmail.com> | 2022-02-08 23:45:26 +0100 |
| commit | d6209cb7ab69794abe10643d2d7f75b0162e55ef (patch) | |
| tree | 27a7631ab8971efa1773cc928b603b1d4330abb6 /pkgs/desktops | |
| parent | bdfe187ba675c680deb89d8d7f1a0f583626f08d (diff) | |
| download | nixlib-d6209cb7ab69794abe10643d2d7f75b0162e55ef.tar nixlib-d6209cb7ab69794abe10643d2d7f75b0162e55ef.tar.gz nixlib-d6209cb7ab69794abe10643d2d7f75b0162e55ef.tar.bz2 nixlib-d6209cb7ab69794abe10643d2d7f75b0162e55ef.tar.lz nixlib-d6209cb7ab69794abe10643d2d7f75b0162e55ef.tar.xz nixlib-d6209cb7ab69794abe10643d2d7f75b0162e55ef.tar.zst nixlib-d6209cb7ab69794abe10643d2d7f75b0162e55ef.zip | |
gnomeExtensions.pop-shell: fix executables
Fix the shebang and set the executable bit for the color_dialog and floating_exceptions executables.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/extensions/pop-shell/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch | 34 |
2 files changed, 10 insertions, 34 deletions
diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index e4f8dfa03cd6..381a82e5bdf0 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -26,6 +26,16 @@ stdenv.mkDerivation rec { extensionPortalSlug = "pop-shell"; }; + postPatch = '' + for file in */main.js; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + done + ''; + + preFixup = '' + chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/*/main.js + ''; + meta = with lib; { description = "Keyboard-driven layer for GNOME Shell"; license = licenses.gpl3Only; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch index e1e6fb7a839a..2f2a0bcfd094 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch +++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -1,20 +1,3 @@ -diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts -index 9522499..9911530 100644 ---- a/src/color_dialog/src/main.ts -+++ b/src/color_dialog/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0'; - -@@ -84,4 +84,4 @@ function launch_color_dialog() { - - Gtk.init(null); - --launch_color_dialog() -\ No newline at end of file -+launch_color_dialog() diff --git a/src/extension.ts b/src/extension.ts index 7417c46..00d5829 100644 --- a/src/extension.ts @@ -28,23 +11,6 @@ index 7417c46..00d5829 100644 if (ipc) { const generator = (stdout: any, res: any) => { -diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts -index f298ec7..87a6bc4 100644 ---- a/src/floating_exceptions/src/main.ts -+++ b/src/floating_exceptions/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0' - -@@ -329,4 +329,4 @@ function main() { - Gtk.main() - } - --main() -\ No newline at end of file -+main() diff --git a/src/panel_settings.ts b/src/panel_settings.ts index 83ff56c..1bc1e98 100644 --- a/src/panel_settings.ts |