From 5a0c05e61bb9828c09be1463c6ab22fb64b29280 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Tue, 28 Jul 2020 15:29:26 +0200
Subject: [PATCH 1/5] =?UTF-8?q?clipmenu=206.0.1=20=E2=86=92=206.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/clipmenu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index 4bc56f0c452..c4155daab82 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -4,13 +4,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clipmenu";
-  version = "6.0.1";
+  version = "6.1.0";
 
   src = fetchFromGitHub {
     owner  = "cdown";
     repo   = "clipmenu";
     rev    = version;
-    sha256 = "0053j4i14lz5m2bzc5sch5id5ilr1bl196mp8fp0q8x74w3vavs9";
+    sha256 = "0ddj5xcwrdb2qvrndvhv8j6swcqc8dvv5i00pqk35rfk5mrl4hwv";
   };
 
   buildInputs = [ makeWrapper ];

From cafe0e2cb1bac4c281cfdb8789519476a03127c0 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Tue, 28 Jul 2020 17:02:08 +0200
Subject: [PATCH 2/5] Use upstream Makefile

Since v 6.1 upstream provides a Makefile, therefore I removed the install steps in `installPhase`.
---
 pkgs/applications/misc/clipmenu/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index c4155daab82..c143f704450 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "0ddj5xcwrdb2qvrndvhv8j6swcqc8dvv5i00pqk35rfk5mrl4hwv";
   };
 
-  buildInputs = [ makeWrapper ];
+  preBuild = ''
+    substituteInPlace ./Makefile --replace /usr "$out"
+  '';
+
+  buildInputs = [ makeWrapper xsel clipnotify ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp clipdel clipmenu clipmenud $out/bin
-
     for bin in $out/bin/*; do
       wrapProgram "$bin" --prefix PATH : "${runtimePath}"
     done

From f8e65461ebd419c953f708a04b03167ed3a3e30d Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Wed, 29 Jul 2020 11:45:18 +0200
Subject: [PATCH 3/5] Update pkgs/applications/misc/clipmenu/default.nix

Co-authored-by: Nikolay Korotkiy <sikmir@gmail.com>
---
 pkgs/applications/misc/clipmenu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index c143f704450..409865692c6 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ddj5xcwrdb2qvrndvhv8j6swcqc8dvv5i00pqk35rfk5mrl4hwv";
   };
 
-  preBuild = ''
+  postPatch = ''
     substituteInPlace ./Makefile --replace /usr "$out"
   '';
 

From cbb9af628ebf330f9e730e4aae74a007ff4316af Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Thu, 30 Jul 2020 11:18:14 +0200
Subject: [PATCH 4/5] xsel and clipnotify binaries in nativeBuildInputs

---
 pkgs/applications/misc/clipmenu/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index 409865692c6..6759521bef1 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     substituteInPlace ./Makefile --replace /usr "$out"
   '';
 
-  buildInputs = [ makeWrapper xsel clipnotify ];
+  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ xsel clipnotify ];
 
   installPhase = ''
     for bin in $out/bin/*; do

From ce37a2e34913d120c6d38af28adc973034e4b90d Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <xaver.hellauer@gmail.com>
Date: Sat, 1 Aug 2020 12:26:00 +0200
Subject: [PATCH 5/5] Update default.nix

---
 pkgs/applications/misc/clipmenu/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index 6759521bef1..54c2ab48f65 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -1,4 +1,4 @@
-{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, lib }:
+{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }:
 let
   runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ];
 in
@@ -12,11 +12,15 @@ stdenv.mkDerivation rec {
     rev    = version;
     sha256 = "0ddj5xcwrdb2qvrndvhv8j6swcqc8dvv5i00pqk35rfk5mrl4hwv";
   };
-
-  postPatch = ''
-    substituteInPlace ./Makefile --replace /usr "$out"
-  '';
-
+  
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/cdown/clipmenu/commit/443b58583ef216e2405e4a38d401f7c36386d21e.patch";
+      sha256 = "12m4rpw7jbr31c919llbsmn8dcf7yh9aijln4iym6h2lylzqzzdz";
+    })
+  ];
+  
+  makeFlags = [ "PREFIX=$(out)" ];
   buildInputs = [ makeWrapper ];
   nativeBuildInputs = [ xsel clipnotify ];