fix: fix pop-shell
This commit is contained in:
parent
d5a74de043
commit
ac677032b9
|
@ -2,23 +2,40 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pop-shell";
|
||||
version = "2021-09-10";
|
||||
version = "2021-10-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "shell";
|
||||
rev = "59ca9cede3c185c347bd2ae3d40882e020fb1fd0";
|
||||
sha256 = "llwchrg/a8QmmD9eOt7IUZY2crYubFSDyvrTVwSz0pE=";
|
||||
rev = "1de4139c5739ff79d7a3ddef7a9a77988a358782";
|
||||
sha256 = "094siblqpsjj356s32dn3rqq0vd47xrmbklzzyx26nh4hxlvzkzb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
|
||||
|
||||
buildInputs = [ gjs ];
|
||||
|
||||
preBuildHook = ''
|
||||
./fix-gjs.patch
|
||||
find . -name '*.ts' -exec sed -i -E 's|^#!/usr/bin/gjs|#!/usr/bin/env gjs|' \{\} \;
|
||||
(fetchpatch {
|
||||
'';
|
||||
|
||||
patches = [ ./gnome-41.patch ];
|
||||
|
||||
# the gschema doesn't seem to be installed properly (see dconf)
|
||||
makeFlags = [
|
||||
"INSTALLBASE=$(out)/share/gnome-shell/extensions"
|
||||
"PLUGIN_BASE=$(out)/share/pop-shell/launcher"
|
||||
"SCRIPTS_BASE=$(out)/share/pop-shell/scripts"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/floating_exceptions/main.js
|
||||
chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/floating_exceptions/main.js
|
||||
chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/color_dialog/main.js
|
||||
chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/color_dialog/main.js
|
||||
rm -rf $out/bin
|
||||
rm -rf $out/bin
|
||||
'';
|
||||
}
|
||||
|
|
15
pkgs/pop-shell/gnome-41.patch
Normal file
15
pkgs/pop-shell/gnome-41.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
diff --git a/metadata.json b/metadata.json
|
||||
index d877ff0..e6e3ce1 100644
|
||||
--- a/metadata.json
|
||||
+++ b/metadata.json
|
||||
@@ -6,6 +6,7 @@
|
||||
"settings-schema": "org.gnome.shell.extensions.pop-shell",
|
||||
"shell-version": [
|
||||
"3.36",
|
||||
- "40.beta"
|
||||
+ "40.beta",
|
||||
+ "41"
|
||||
]
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
Loading…
Reference in a new issue