From 0821541f6561361706ff0cce830acf24eba3bbc0 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jtbx@disroot.org>
Date: Mon, 5 Feb 2024 06:38:08 +1300
Subject: [PATCH 1/2] farge: migrate to pkgs/by-name

---
 .../misc/farge/default.nix => by-name/fa/farge/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/farge/default.nix => by-name/fa/farge/package.nix} (100%)

diff --git a/pkgs/tools/misc/farge/default.nix b/pkgs/by-name/fa/farge/package.nix
similarity index 100%
rename from pkgs/tools/misc/farge/default.nix
rename to pkgs/by-name/fa/farge/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03769b97d6c5..4d48efaf4a72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8248,8 +8248,6 @@ with pkgs;
 
   faraday-cli = callPackage ../tools/security/faraday-cli { };
 
-  farge = callPackage ../tools/misc/farge { };
-
   fastlane = callPackage ../tools/admin/fastlane { };
 
   fatresize = callPackage ../tools/filesystems/fatresize { };

From c670f2d94d4e1de9ee35b9286d2a75cd3c3bcd62 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jtbx@disroot.org>
Date: Mon, 5 Feb 2024 06:39:46 +1300
Subject: [PATCH 2/2] farge: use stdenvNoCC, fix style

---
 pkgs/by-name/fa/farge/package.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/fa/farge/package.nix b/pkgs/by-name/fa/farge/package.nix
index 1abffc64e026..64ab2b084e4c 100644
--- a/pkgs/by-name/fa/farge/package.nix
+++ b/pkgs/by-name/fa/farge/package.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, stdenvNoCC
 , fetchFromGitHub
 , makeBinaryWrapper
 , bc
@@ -10,11 +10,12 @@
 , slurp
 , wl-clipboard
 , xcolor
+
 , waylandSupport ? true
 , x11Support ? true
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "farge";
   version = "1.0.9";
 
@@ -31,26 +32,28 @@ stdenv.mkDerivation (finalAttrs: {
   wrapperPath = lib.makeBinPath ([
     bc
     feh
-    #Needed to fix convert: unable to read font `(null)' @ error/annotate.c/RenderFreetype issue
-    (imagemagick.override { ghostscriptSupport = true;})
-    libnotify #Needed for the notify-send function call from the script
-  ] ++ lib.optionals waylandSupport [ grim slurp wl-clipboard ]
-    ++ lib.optionals x11Support [ xcolor ]);
+    libnotify # notify-send
+    # Needed to fix font rendering issue in imagemagick
+    (imagemagick.override { ghostscriptSupport = true; })
+  ] ++ lib.optionals waylandSupport [
+    grim
+    slurp
+    wl-clipboard
+  ] ++ lib.optional x11Support xcolor);
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/bin
-    install -m755 farge $out/bin
+    install -Dm755 farge $out/bin/farge
     wrapProgram $out/bin/farge \
-        --prefix PATH : "${finalAttrs.wrapperPath}"
+      --prefix PATH : "${finalAttrs.wrapperPath}"
     runHook postInstall
   '';
 
   meta = with lib; {
-    description = "A tool that shows the color value of a given pixel on your screen";
+    description = "View the color value of a specific pixel on your screen";
     homepage = "https://github.com/sdushantha/farge";
     license = licenses.mit;
-    platforms = platforms.all;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ jtbx justinlime ];
     mainProgram = "farge";
   };