From d1230bc68e14baeab7febd96c73c7fe6cb4a5bab Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 9 Aug 2025 23:59:46 +0100
Subject: [PATCH] contour: unpin LLVM

Fails to build on Darwin, but because of `sigtool` limitations at
install time, not because of LLVM.
---
 pkgs/by-name/co/contour/package.nix | 7 +++----
 pkgs/top-level/all-packages.nix     | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix
index 67282ea8a1aa..61307ebbdf4d 100644
--- a/pkgs/by-name/co/contour/package.nix
+++ b/pkgs/by-name/co/contour/package.nix
@@ -20,8 +20,7 @@
   yaml-cpp,
   ncurses,
   file,
-  libutil,
-  sigtool,
+  darwin,
   nixosTests,
   installShellFiles,
   reflection-cpp,
@@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.wrapQtAppsHook
     installShellFiles
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
 
   buildInputs = [
     boxed-cpp
@@ -74,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libutil
+    darwin.libutil
   ];
 
   cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10eb1c12d1ae..b3ebbd1f71d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1472,11 +1472,6 @@ with pkgs;
 
   ### APPLICATIONS/TERMINAL-EMULATORS
 
-  contour = callPackage ../by-name/co/contour/package.nix {
-    inherit (darwin) libutil sigtool;
-    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv;
-  };
-
   cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
 
   kitty = callPackage ../by-name/ki/kitty/package.nix {