talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

contour: unpin LLVM

Browse Source 
Fails to build on Darwin, but because of `sigtool` limitations at
install time, not because of LLVM.
This commit is contained in:
Emily 2025-08-09 23:59:46 +01:00
parent 8153126f49
commit d1230bc68e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/by-name/co/contour/package.nix
View File

@ -20,8 +20,7 @@
yaml-cpp, yaml-cpp,
ncurses, ncurses,
file, file,
libutil, darwin,
sigtool,
nixosTests, nixosTests,
installShellFiles, installShellFiles,
reflection-cpp, reflection-cpp,
@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.wrapQtAppsHook qt6.wrapQtAppsHook
installShellFiles installShellFiles
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
buildInputs = [ buildInputs = [
boxed-cpp boxed-cpp
@ -74,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
libutil darwin.libutil
]; ];
cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];

5
pkgs/top-level/all-packages.nix
View File

@ -1472,11 +1472,6 @@ with pkgs;
### APPLICATIONS/TERMINAL-EMULATORS ### 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 { }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
kitty = callPackage ../by-name/ki/kitty/package.nix { kitty = callPackage ../by-name/ki/kitty/package.nix {