summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-08-16 21:17:29 +0800
committerGitHub <noreply@github.com>2023-08-16 21:17:29 +0800
commit8639573ee8c9a9af8da8ab8d0dccd50461b2cda2 (patch)
tree42a694428e7e3dec17732ef474727868a3e460c5
parent9b2aa98db6b10503666a50f4eb93b2fc0d57bde5 (diff)
parent4904773edb157d7be30dd55a2816666fe7164fa4 (diff)
downloadnixpkgs-8639573ee8c9a9af8da8ab8d0dccd50461b2cda2.tar
nixpkgs-8639573ee8c9a9af8da8ab8d0dccd50461b2cda2.tar.gz
nixpkgs-8639573ee8c9a9af8da8ab8d0dccd50461b2cda2.tar.bz2
nixpkgs-8639573ee8c9a9af8da8ab8d0dccd50461b2cda2.tar.lz
nixpkgs-8639573ee8c9a9af8da8ab8d0dccd50461b2cda2.tar.xz
nixpkgs-8639573ee8c9a9af8da8ab8d0dccd50461b2cda2.tar.zst
nixpkgs-8639573ee8c9a9af8da8ab8d0dccd50461b2cda2.zip
Merge pull request #249491 from bobby285271/upd/pantheon
pantheon.elementary-files: Fix log spam with new GLib
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-files/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index fb413d539a4..9d01f85e0ef 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@@ -39,6 +40,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-s4Df2eLnr+RnbTwPzjt9bVA+xZ9xca2hiFdGlRUZRfU=";
   };
 
+  patches = [
+    # Fix log spam with new GLib
+    # https://github.com/elementary/files/pull/2257
+    (fetchpatch {
+      url = "https://github.com/elementary/files/commit/7bd542fa0a646b5cb0972f5575c56a9ee4d9dce7.patch";
+      hash = "sha256-C+oSx0xn3YPuwEC0K+3ZmKeQrroKreJo1tfcpLGQ1S4=";
+    })
+  ];
+
   nativeBuildInputs = [
     desktop-file-utils
     meson