push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,59 @@
{
stdenv,
lib,
fetchFromGitHub,
glib,
gjs,
typescript,
unstableGitUpdater,
}:
stdenv.mkDerivation {
pname = "gnome-shell-extension-pop-shell";
version = "1.2.0-unstable-2025-07-09";
src = fetchFromGitHub {
owner = "pop-os";
repo = "shell";
rev = "6fd8c039a081e8ad7bbd40ef7883ec6e5fc2a3f8";
hash = "sha256-3zIbfjaJSUbPmUVppoSBWviQWQvykaT1qw9uQvcXmvM=";
};
nativeBuildInputs = [
glib
gjs
typescript
];
buildInputs = [ gjs ];
patches = [
./fix-gjs.patch
];
makeFlags = [ "XDG_DATA_HOME=$(out)/share" ];
passthru = {
extensionUuid = "pop-shell@system76.com";
extensionPortalSlug = "pop-shell";
updateScript = unstableGitUpdater { };
};
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;
platforms = platforms.linux;
maintainers = [ maintainers.genofire ];
homepage = "https://github.com/pop-os/shell";
};
}

View File

@@ -0,0 +1,38 @@
diff --git a/src/extension.ts b/src/extension.ts
index f34e865..f12d4db 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -556,7 +556,7 @@ export class Ext extends Ecs.System<ExtEvent> {
return true;
};
- const ipc = utils.async_process_ipc(['gjs', '--module', path]);
+ const ipc = utils.async_process_ipc([path]);
if (ipc) {
const generator = (stdout: any, res: any) => {
diff --git a/src/panel_settings.ts b/src/panel_settings.ts
index fbcafbf..ef409ee 100644
--- a/src/panel_settings.ts
+++ b/src/panel_settings.ts
@@ -352,7 +352,7 @@ function color_selector(ext: Ext, menu: any) {
color_selector_item.add_child(color_button);
color_button.connect('button-press-event', () => {
let path = get_current_path() + '/color_dialog/main.js';
- let resp = GLib.spawn_command_line_async(`gjs --module ${path}`);
+ let resp = GLib.spawn_command_line_async(`${path}`);
if (!resp) {
return null;
}
diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts
index a9637e5..5cb86ce 100644
--- a/src/color_dialog/src/main.ts
+++ b/src/color_dialog/src/main.ts
@@ -6,6 +6,7 @@ import Gtk from 'gi://Gtk?version=3.0';
import Gdk from 'gi://Gdk';
const EXT_PATH_DEFAULTS = [
+ '/run/current-system/sw/share/gnome-shell/extensions/',
GLib.get_home_dir() + '/.local/share/gnome-shell/extensions/',
'/usr/share/gnome-shell/extensions/',
];