From 0de2f5816b3b0d186efa114ea518908ade4db040 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:01 +0100 Subject: [PATCH] Revert "fltk_1_{3,4}: fix darwin build" The ld64 issue has been fixed. This reverts commit a450c2d068f288e3ca1279f889265101ec08790a. --- pkgs/by-name/fl/fltk_1_3/package.nix | 12 ------------ pkgs/by-name/fl/fltk_1_4/package.nix | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/pkgs/by-name/fl/fltk_1_3/package.nix b/pkgs/by-name/fl/fltk_1_3/package.nix index af71afe150d8..41762add1ce7 100644 --- a/pkgs/by-name/fl/fltk_1_3/package.nix +++ b/pkgs/by-name/fl/fltk_1_3/package.nix @@ -35,8 +35,6 @@ withShared ? true, nix-update-script, - # TODO: Clean up on `staging` - llvmPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -70,10 +68,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withDocs [ doxygen graphviz - ] - # TODO: Clean up on `staging` - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - llvmPackages.lld ]; buildInputs = @@ -145,12 +139,6 @@ stdenv.mkDerivation (finalAttrs: { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) - ] - # Fix for ld64 hardening issue - # - # TODO: Clean up on `staging` - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD") ]; preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/by-name/fl/fltk_1_4/package.nix b/pkgs/by-name/fl/fltk_1_4/package.nix index f6fe650fafd7..57d9b9d87805 100644 --- a/pkgs/by-name/fl/fltk_1_4/package.nix +++ b/pkgs/by-name/fl/fltk_1_4/package.nix @@ -46,8 +46,6 @@ withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform), nix-update-script, - # TODO: Clean up on `staging` - llvmPackages, }: # pango support depends on Xft @@ -86,10 +84,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withDocs [ doxygen graphviz - ] - # TODO: Clean up on `staging` - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - llvmPackages.lld ]; buildInputs = @@ -175,12 +169,6 @@ stdenv.mkDerivation (finalAttrs: { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) - ] - # Fix for ld64 hardening issue - # - # TODO: Clean up on `staging` - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD") ]; postBuild = lib.optionalString withDocs ''