From fac56b935339f50c6582b5fccf0bcf33d69b9741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Jul 2026 10:44:23 -0400 Subject: [PATCH 01/10] qbittorrent: fix darwin build --- pkgs/by-name/qb/qbittorrent/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index 671e1d0e3d2b..07f1fe49193e 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -17,6 +17,7 @@ wrapGAppsHook3, zlib, nixosTests, + llvmPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -35,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 qt6.wrapQtAppsHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # TODO: Remove once #536365 reaches this branch + llvmPackages.lld ]; buildInputs = [ @@ -60,6 +65,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + qtWrapperArgs = lib.optionals trackerSearch [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ]; dontWrapGApps = true; From cb75965a98349f1ef907a5b8634e71a24a096a00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jul 2026 14:09:18 +0000 Subject: [PATCH 02/10] stevenblack-blocklist: 3.16.94 -> 3.16.97 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 88e5948799ab..6e406f749753 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.94"; + version = "3.16.97"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-vVEf9FAXT4QgwM2BZF593JVD7NpTlwXdy9JXrnufhAo="; + hash = "sha256-5r8r57m+Ilce6Onu/svc05yyrLGH5S65RixbwqlpmPU="; }; outputs = [ From d2eb2d3d14c64dae4dbf09ea94d92633aa3a7b5f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 13 Jul 2026 00:23:45 +0200 Subject: [PATCH 03/10] pyxel: 2.8.10 -> 2.9.7, fix build --- pkgs/by-name/py/pyxel/package.nix | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix index 7ab45a73ad22..456378be116f 100644 --- a/pkgs/by-name/py/pyxel/package.nix +++ b/pkgs/by-name/py/pyxel/package.nix @@ -11,36 +11,26 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "pyxel"; - version = "2.8.10"; + version = "2.9.7"; pyproject = true; src = fetchFromGitHub { owner = "kitao"; repo = "pyxel"; tag = "v${finalAttrs.version}"; - hash = "sha256-+SitYe2HFA6rwqk5lipcKFdBy69zdAhw3Q+Nb0iBx6s="; + hash = "sha256-k86VRX25yVNZvsnsWl0EYGd8njhx9yl6gkqI7mznjEs="; }; - patches = [ - (fetchpatch { - name = "add-Cargo.lock.patch"; - url = "https://github.com/kitao/pyxel/commit/821286112ea0c26141aa64b25aaa076611a2a91d.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-XtFdtmprPKrdjFOzEsNMJjc4PpNv6KDtWX2Hes2IKe0="; - }) - ]; - cargoRoot = "crates"; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src - patches pname version cargoRoot ; - hash = "sha256-SGrQmGZeM2NcooDqCTO2HOXgLg7h+VvDIierDacqSFs="; + hash = "sha256-tpJSUdjdXwXK/n1nyMga5uTk7TAz/JLQVN0rSdbKxGk="; }; buildAndTestSubdir = "python"; @@ -62,6 +52,11 @@ python3Packages.buildPythonApplication (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + preBuild = '' + # logic taken from Makefile + cp LICENSE README.md python/pyxel/ + ''; + # Tests want to use the display doCheck = false; From 7168ff819ba911776e0bfd96ad949d05854339d7 Mon Sep 17 00:00:00 2001 From: Samiser Date: Mon, 13 Jul 2026 23:45:07 +0100 Subject: [PATCH 04/10] blueutil: fix build by linking with lld --- pkgs/by-name/bl/blueutil/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix index 31d6eaf1cadd..6f13a65ab4f1 100644 --- a/pkgs/by-name/bl/blueutil/package.nix +++ b/pkgs/by-name/bl/blueutil/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + llvmPackages, testers, nix-update-script, }: @@ -17,7 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Qw5c9dp7wpuOcQSLsg1pfJ+NbrEtme2o6nKD3Ba3A3M="; }; + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + nativeBuildInputs = [ llvmPackages.lld ]; + env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth"; + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + env.NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}"; installPhase = '' runHook preInstall From f2722a7fade8fdda3a0ee2d682c9009f543d2b06 Mon Sep 17 00:00:00 2001 From: Mukul Agarwal Date: Mon, 13 Jul 2026 19:21:36 -0400 Subject: [PATCH 05/10] noti: fix build on Darwin --- pkgs/by-name/no/noti/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix index 264e5e34fbfe..a51018ab362d 100644 --- a/pkgs/by-name/no/noti/package.nix +++ b/pkgs/by-name/no/noti/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildGoModule, fetchFromCodeberg, + llvmPackages, installShellFiles, }: @@ -18,10 +20,19 @@ buildGoModule (finalAttrs: { vendorHash = null; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; subPackages = [ "cmd/noti" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Work around ld64's libc++ hardening issue. + # TODO: Remove once #536365 reaches this branch. + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + ldflags = [ "-s" "-w" From c0984aabedab91dd368f572dad3e7c6015abed3f Mon Sep 17 00:00:00 2001 From: Mukul Agarwal Date: Mon, 13 Jul 2026 19:38:31 -0400 Subject: [PATCH 06/10] mactop: fix build on Darwin --- pkgs/by-name/ma/mactop/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index e54d58aec534..7b0a15ee20c7 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + llvmPackages, versionCheckHook, nix-update-script, }: @@ -21,6 +22,14 @@ buildGoModule rec { proxyVendor = true; + nativeBuildInputs = [ llvmPackages.lld ]; + + env = { + # Work around ld64's libc++ hardening issue. + # TODO: Remove once #536365 reaches this branch. + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + ldflags = [ "-s" "-w" From 3aad607343efb414fdf22fc1284c99c3f640ed3e Mon Sep 17 00:00:00 2001 From: Mukul Agarwal Date: Mon, 13 Jul 2026 20:48:49 -0400 Subject: [PATCH 07/10] darktable: fix build on Darwin --- pkgs/by-name/da/darktable/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index c954ded2f1f6..d70fc071213a 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -103,7 +103,8 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook3 saxon # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; buildInputs = [ SDL2 @@ -184,6 +185,12 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Work around ld64's libc++ hardening issue. + # TODO: Remove once #536365 reaches this branch. + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in From 962708f17c4aef6598e0651c534d3e9d05849461 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 13 Jul 2026 20:56:25 -0400 Subject: [PATCH 08/10] vikunja: Set version metadata at build time Otherwise About modal shows the frontend version as "dev". Assisted-by: Codex gpt-5.6-sol high --- pkgs/by-name/vi/vikunja/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index 0f1bbf22d5f6..5d0aa4dcef05 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -47,6 +47,11 @@ let pnpm_10 ]; + postPatch = '' + substituteInPlace src/version.json \ + --replace-fail '"dev"' '"${finalAttrs.version}"' + ''; + doCheck = true; postBuild = '' From d846912fb0b533478ce337c08bd303c8635015cd Mon Sep 17 00:00:00 2001 From: Samiser Date: Tue, 14 Jul 2026 10:55:40 +0100 Subject: [PATCH 09/10] gtk4: fix build on darwin by linking with lld --- pkgs/by-name/gt/gtk4/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix index 9b7807508a35..c92464ba6e3d 100644 --- a/pkgs/by-name/gt/gtk4/package.nix +++ b/pkgs/by-name/gt/gtk4/package.nix @@ -60,6 +60,7 @@ compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages, cups, libexecinfo, + llvmPackages, broadwaySupport ? true, testers, darwinMinVersionHook, @@ -130,6 +131,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals vulkanSupport [ shaderc # for glslc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + llvmPackages.lld + ] ++ finalAttrs.setupHooks; buildInputs = [ @@ -221,6 +226,10 @@ stdenv.mkDerivation (finalAttrs: { } // lib.optionalAttrs stdenv.hostPlatform.isMusl { NIX_LDFLAGS = "-lexecinfo"; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}"; }; postPatch = '' From 490db099aa4330d875b6f6c0d02f57d3b7a29d98 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Tue, 14 Jul 2026 20:42:06 +0800 Subject: [PATCH 10/10] stats: fix darwin build --- pkgs/by-name/st/stats/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 5168a4051808..00ef020ed709 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -3,6 +3,8 @@ swiftPackages, fetchFromGitHub, leveldb, + # TODO: Clean up on `staging`. + llvmPackages, perl, actool, makeWrapper, @@ -88,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: { actool makeWrapper rcodesign + # TODO: Clean up on `staging`. + llvmPackages.lld ]; buildInputs = [ leveldb ]; @@ -126,6 +130,8 @@ stdenv.mkDerivation (finalAttrs: { # The Swift compiler in nixpkgs uses SDK 14 headers (which compile fine), but without # this flag the linker records SDK 14 and macOS withholds it (Liquid Glass) -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0 + # TODO: Clean up on `staging` + -use-ld=lld ) buildFramework() {