swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-23 21:55:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208308 from bobby285271/cinnamon

Browse source 
cinnamon.muffin: Backport a crash fix
This commit is contained in:
Bobby Rong 2022-12-30 20:17:59 +08:00 committed by GitHub
parent de07c59526 5ce341ff6d
commit e6c26349fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/desktops/cinnamon/muffin/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, substituteAll
, cairo
, cinnamon-desktop
@ -39,13 +40,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
patches = [
(substituteAll {
src = ./fix-paths.patch;
zenity = gnome.zenity;
})
];
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
@ -53,6 +47,20 @@ stdenv.mkDerivation rec {
hash = "sha256-bHEBzl0aBXsHOhSWJUz428pG5M6L0s/Q6acKO+2oMXo=";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
zenity = gnome.zenity;
})
# compositor: Fix crash when restarting Cinnamon
# https://github.com/linuxmint/muffin/pull/655
(fetchpatch {
url = "https://github.com/linuxmint/muffin/commit/1a941ec603a1565dbd2f943f7da6e877d1541bcb.patch";
sha256 = "sha256-6x64rWQ20ZjM9z79Pg6QMDPeFN5VNdDHBueRvy2kA6c=";
})
];
nativeBuildInputs = [
desktop-file-utils
mesa # needed for gbm