From 467a6ddac7f379cef84bdbafe85fc3543c195630 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 4 May 2025 00:54:52 +0200
Subject: [PATCH 1/2] unclutter: fix build

---
 pkgs/by-name/un/unclutter/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix
index 6d2193e42d7e..e97a2b1d9b0f 100644
--- a/pkgs/by-name/un/unclutter/package.nix
+++ b/pkgs/by-name/un/unclutter/package.nix
@@ -15,7 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 ];
 
-  buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+  buildFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "CFLAGS=-std=c89"
+  ];
 
   installPhase = ''
     mkdir -pv "$out/bin"

From 8e2d898e3f5f21b7dc79fefc34506cf82b75dea3 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 4 May 2025 09:13:43 +0200
Subject: [PATCH 2/2] unclutter: clean up the install phase

---
 pkgs/by-name/un/unclutter/package.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/un/unclutter/package.nix b/pkgs/by-name/un/unclutter/package.nix
index e97a2b1d9b0f..d586ec94eca0 100644
--- a/pkgs/by-name/un/unclutter/package.nix
+++ b/pkgs/by-name/un/unclutter/package.nix
@@ -20,11 +20,19 @@ stdenv.mkDerivation rec {
     "CFLAGS=-std=c89"
   ];
 
-  installPhase = ''
-    mkdir -pv "$out/bin"
-    mkdir -pv "$out/share/man/man1"
-    make DESTDIR="$out" BINDIR="$out/bin" PREFIX="" install
-    make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man
+  installFlags = [
+    "DESTDIR=${placeholder "out"}"
+    "BINDIR=${placeholder "out"}/bin"
+    "MANPATH=${placeholder "out"}/share/man"
+  ];
+
+  installTargets = [
+    "install"
+    "install.man"
+  ];
+
+  preInstall = ''
+    mkdir -pv "$out"/{bin,share/man/man1}
   '';
 
   meta = with lib; {