uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
46
pkgs/desktops/gnome/extensions/pop-shell/default.nix
Normal file
46
pkgs/desktops/gnome/extensions/pop-shell/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ stdenv, lib, fetchFromGitHub, glib, nodePackages, gjs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-pop-shell";
|
||||
version = "unstable-2022-03-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "shell";
|
||||
rev = "a317816d02dd2cb20d31aeca81bf09eccc63e370";
|
||||
hash = "sha256-uxoeCv25ew5+NkTpsKjQqDFrqw6ZA/+iYhyCHoCb6jM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
|
||||
|
||||
buildInputs = [ gjs ];
|
||||
|
||||
patches = [
|
||||
./fix-gjs.patch
|
||||
];
|
||||
|
||||
makeFlags = [ "XDG_DATA_HOME=$(out)/share" ];
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "pop-shell@system76.com";
|
||||
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;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.genofire ];
|
||||
homepage = "https://github.com/pop-os/shell";
|
||||
};
|
||||
}
|
||||
33
pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch
Normal file
33
pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
diff --git a/src/extension.ts b/src/extension.ts
|
||||
index 7417c46..00d5829 100644
|
||||
--- a/src/extension.ts
|
||||
+++ b/src/extension.ts
|
||||
@@ -534,7 +534,7 @@ export class Ext extends Ecs.System<ExtEvent> {
|
||||
return true
|
||||
}
|
||||
|
||||
- const ipc = utils.async_process_ipc(["gjs", 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 83ff56c..1bc1e98 100644
|
||||
--- a/src/panel_settings.ts
|
||||
+++ b/src/panel_settings.ts
|
||||
@@ -338,7 +338,7 @@ function color_selector(ext: Ext, menu: any) {
|
||||
color_selector_item.add_child(color_button);
|
||||
color_button.connect('button-press-event', () => {
|
||||
let path = Me.dir.get_path() + "/color_dialog/main.js";
|
||||
- let resp = GLib.spawn_command_line_async(`gjs ${path}`);
|
||||
+ let resp = GLib.spawn_command_line_async(path);
|
||||
if (!resp) {
|
||||
|
||||
return null;
|
||||
@@ -353,4 +353,4 @@ function color_selector(ext: Ext, menu: any) {
|
||||
});
|
||||
|
||||
return color_selector_item;
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Loading…
Add table
Add a link
Reference in a new issue