Merge pull request #211180 from VergeDX/gpick

gpick: 0.2.6 -> 0.3

pkgs/tools/misc/gpick/default.nix

@@ -1,29 +1,38 @@
 { stdenv
 , fetchFromGitHub
 , cmake
-, glib
 , wrapGAppsHook
 , boost
 , pkg-config
 , gtk3
 , ragel
 , lua
+, fetchpatch
 , lib
 }:
 
 stdenv.mkDerivation rec {
   pname = "gpick";
-  version = "0.2.6";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "thezbyg";
     repo = pname;
-    rev = "${pname}-${version}";
-    sha256 = "sha256-Z67EJRtKJZLoTUtdMttVTLkzTV2F5rKZ96vaothLiFo=";
+    rev = "v${version}";
+    hash = "sha256-Z17YpdAAr2wvDFkrAosyCN6Y/wsFVkiB9IDvXuP9lYo=";
   };
 
+  patches = [
+    # gpick/cmake/Version.cmake
+    ./dot-version.patch
+
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/archlinux/svntogit-community/1d53a9aace4bb60300e52458bb1577d248cb87cd/trunk/buildfix.diff";
+      hash = "sha256-DnRU90VPyFhLYTk4GPJoiVYadJgtYgjMS4MLgmpYLP0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
   buildInputs = [ boost gtk3 ragel lua ];
 
   meta = with lib; {

pkgs/tools/misc/gpick/dot-version.patch

@@ -0,0 +1,10 @@
+diff --git a/.version b/.version
+new file mode 100644
+index 0000000..abc36c9
+--- /dev/null
++++ b/.version
+@@ -0,0 +1,4 @@
++0.3
++0
++dd27232a4dd08cf6271ecc2a7e96da25f8071ed5
++2022-05-08