nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-03 10:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #319335 from bobby285271/upd/cinnamon-xapps

Browse Source 
Cinnamon updates 2024-06-12
This commit is contained in:
Bobby Rong 2024-06-14 21:29:16 +08:00 committed by GitHub
commit 995d68e262
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/xed-editor/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xed-editor"; pname = "xed-editor";
version = "3.6.1"; version = "3.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = "xed"; repo = "xed";
rev = version; rev = version;
sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8="; sha256 = "sha256-+yY+vzDMeS4AMMAklzADD4/LAQgav3clM2CCK6xh47Q=";
}; };
patches = [ patches = [

14
pkgs/applications/misc/sticky/default.nix
View File

@ -15,17 +15,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sticky"; pname = "sticky";
version = "1.19"; version = "1.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-nvnft62vZ9ivijYnQGULW7ff2aAVJiIx9xq09My2NxE="; hash = "sha256-HzTXaJgDu72pWM0mGNNBy2yFB0u0rqATFK9JzyOw8oE=";
}; };
postPatch = '' postPatch = ''
sed -i -e "s|/usr/bin|$out/bin|" data/org.x.sticky.service
sed -i -e "s|/usr/lib|$out/lib|" usr/bin/sticky sed -i -e "s|/usr/lib|$out/lib|" usr/bin/sticky
sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py
''; '';
@ -51,20 +50,11 @@ stdenv.mkDerivation rec {
xapp xapp
]; ];
postInstall = ''
# https://github.com/linuxmint/sticky/pull/118
cp -r ../etc $out
cp -r ../usr/* $out
glib-compile-schemas $out/share/glib-2.0/schemas
'';
dontWrapGApps = true; dontWrapGApps = true;
preFixup = '' preFixup = ''
buildPythonPath "$out $pythonPath" buildPythonPath "$out $pythonPath"
chmod +x $out/bin/sticky
wrapProgram $out/bin/sticky \ wrapProgram $out/bin/sticky \
--prefix PYTHONPATH : "$program_PYTHONPATH" \ --prefix PYTHONPATH : "$program_PYTHONPATH" \
''${gappsWrapperArgs[@]} ''${gappsWrapperArgs[@]}

10
pkgs/desktops/cinnamon/warpinator/default.nix
View File

@ -36,13 +36,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "warpinator"; pname = "warpinator";
version = "1.8.3"; version = "1.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-qtz8/vO6LJ19NcuFf9p3DWNy41kkoBWlgZGChlnTOvI="; hash = "sha256-T1boMqzAGMjUD62ZAlWNOe3xUx5H5ZwpR7MNipy/LKA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -78,9 +78,9 @@ stdenv.mkDerivation rec {
# We make bubblewrap mode always available since # We make bubblewrap mode always available since
# landlock mode is not supported in old kernels. # landlock mode is not supported in old kernels.
substituteInPlace src/warpinator-launch.py \ substituteInPlace src/warpinator-launch.py \
--replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \ --replace-fail '"/usr/bin/python3"' '"${pythonEnv.interpreter}"' \
--replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \ --replace-fail "/usr/bin/bwrap" "${bubblewrap}/bin/bwrap" \
--replace 'GLib.find_program_in_path("bwrap")' "True" --replace-fail 'GLib.find_program_in_path("bwrap")' "True"
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {