pyrox.dev / nixpkgs
lol
fork atom

contour: unpin LLVM

Fails to build on Darwin, but because of `sigtool` limitations at
install time, not because of LLVM.

Emily d1230bc6 8153126f

+3 -9
unified split
+3 -4
pkgs/by-name/co/contour/package.nix
··· 20 yaml-cpp, 21 ncurses, 22 file, 23 - libutil, 24 - sigtool, 25 nixosTests, 26 installShellFiles, 27 reflection-cpp, ··· 53 qt6.wrapQtAppsHook 54 installShellFiles 55 ] 56 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; 57 58 buildInputs = [ 59 boxed-cpp ··· 74 ] 75 ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] 76 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 77 - libutil 78 ]; 79 80 cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];
··· 20 yaml-cpp, 21 ncurses, 22 file, 23 + darwin, 24 nixosTests, 25 installShellFiles, 26 reflection-cpp, ··· 52 qt6.wrapQtAppsHook 53 installShellFiles 54 ] 55 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; 56 57 buildInputs = [ 58 boxed-cpp ··· 73 ] 74 ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] 75 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 76 + darwin.libutil 77 ]; 78 79 cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ];
-5
pkgs/top-level/all-packages.nix
··· 1472 1473 ### APPLICATIONS/TERMINAL-EMULATORS 1474 1475 - contour = callPackage ../by-name/co/contour/package.nix { 1476 - inherit (darwin) libutil sigtool; 1477 - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else stdenv; 1478 - }; 1479 - 1480 cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; 1481 1482 kitty = callPackage ../by-name/ki/kitty/package.nix {
··· 1472 1473 ### APPLICATIONS/TERMINAL-EMULATORS 1474 1475 cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; 1476 1477 kitty = callPackage ../by-name/ki/kitty/package.nix {