b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #223679 from bobby285271/upd/cinnamon

Browse source 
Cinnamon updates 2023-03-29
This commit is contained in:
Bobby Rong 2023-03-29 21:36:10 +08:00 committed by GitHub
parent e02ad91f56 4831d420c2
commit 90c9177eb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/cinnamon/nemo/default.nix
View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "5.6.4";
version = "5.6.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-zvELN9ggfmfIEPeD0VEWM25kRi8RWA/aKlrdO5dKX1k=";
sha256 = "sha256-HdDe2VE9LQqiwFrUSIctOi/ffNOmLy6SyG30EL8UA5Q=";
};
patches = [

14
pkgs/desktops/cinnamon/xapp/default.nix
View file

@ -1,5 +1,4 @@
{ fetchFromGitHub
, fetchpatch
, glib
, gobject-introspection
, gtk3
@ -23,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "xapp";
version = "2.4.2";
version = "2.4.3";
outputs = [ "out" "dev" ];
@ -31,18 +30,9 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM=";
hash = "sha256-j04vy/uVWY08Xdxqfo2MMUAlqsUMJTsAt67+XjkdhFg=";
};
patches = [
# xapp-sn-watcher crashes on cinnamon with glib 2.76.0
# https://github.com/linuxmint/xapp/issues/165
(fetchpatch {
url = "https://github.com/linuxmint/xapp/commit/3ef9861d6228c2061fbde2c0554be5ae6f42befa.patch";
sha256 = "sha256-7hYXA43UQpBLLjRVPoACc8xdhKyKnt3cDUBL4PhEtJY=";
})
];
nativeBuildInputs = [
meson
ninja