summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2023-07-21 20:25:05 -0300
committerGitHub <noreply@github.com>2023-07-21 20:25:05 -0300
commit9b23a95e30e0b8fd84636bad5abed51a00034b9f (patch)
treec06773630c8ae57e1b884c4e893098f970a1e603
parentc6d9dfa60bd7010401c3249354039bbf8b06019f (diff)
parentf3d335e9be634483f725759c272b6071d52705df (diff)
downloadnixpkgs-9b23a95e30e0b8fd84636bad5abed51a00034b9f.tar
nixpkgs-9b23a95e30e0b8fd84636bad5abed51a00034b9f.tar.gz
nixpkgs-9b23a95e30e0b8fd84636bad5abed51a00034b9f.tar.bz2
nixpkgs-9b23a95e30e0b8fd84636bad5abed51a00034b9f.tar.lz
nixpkgs-9b23a95e30e0b8fd84636bad5abed51a00034b9f.tar.xz
nixpkgs-9b23a95e30e0b8fd84636bad5abed51a00034b9f.tar.zst
nixpkgs-9b23a95e30e0b8fd84636bad5abed51a00034b9f.zip
Merge pull request #244547 from SFrijters/tint2-17.1.3
tint2: 17.0.2 -> 17.1.3, switch to fork, fix compatibility with glib >= 2.76
-rw-r--r--pkgs/applications/misc/tint2/default.nix19
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 131cb0f22ad..ac50a46fde6 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitLab
+, fetchpatch
 , pkg-config
 , cmake
 , gettext
@@ -24,15 +25,25 @@
 
 stdenv.mkDerivation rec {
   pname = "tint2";
-  version = "17.0.2";
+  version = "17.1.3";
 
   src = fetchFromGitLab {
-    owner = "o9000";
+    owner = "nick87720z";
     repo = "tint2";
     rev = version;
-    sha256 = "sha256-SqpAjclwu3HN07LAZgvXGzjMK6G+nYLDdl90o1+9aog=";
+    hash = "sha256-9sEe/Gnj+FWLPbWBtfL1YlNNC12j7/KjQ40xdkaFJVQ=";
   };
 
+  patches = [
+    # Fix crashes with glib >= 2.76
+    # https://patchespromptly.com/glib2/
+    # https://gitlab.com/nick87720z/tint2/-/issues/4
+    (fetchpatch {
+      url = "https://gitlab.com/nick87720z/tint2/uploads/7de4501a4fa4fffa5ba8bb0fa3d19f78/glib.patch";
+      hash = "sha256-K547KYlRkVl1s2THi3ZCRuM447EFJwTqUEBjKQnV8Sc=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake
@@ -72,7 +83,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://gitlab.com/o9000/tint2";
+    homepage = "https://gitlab.com/nick87720z/tint2";
     description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
     license = licenses.gpl2Only;
     platforms = platforms.linux;