nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-20 15:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fltk_1_{3,4}: fix darwin build"

Browse Source 
The ld64 issue has been fixed.

This reverts commit a450c2d068.
This commit is contained in:
Emily
2026-07-15 03:19:01 +01:00
parent 9ae5809035
commit 0de2f5816b
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/by-name/fl/fltk_1_3/package.nix
View File

@@ -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) ''

12
pkgs/by-name/fl/fltk_1_4/package.nix
View File

@@ -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 ''