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 "wxwidgets_{3_1,3_2,3_3}: work around ld64 hardening issue"

Browse Source 
The ld64 issue has been fixed.

This reverts commit 89af4db9cf.
This commit is contained in:
Emily
2026-07-15 03:19:06 +01:00
parent c00cb4542a
commit 7b6ed7cb7a
3 changed files with 21 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/by-name/wx/wxwidgets_3_1/package.nix
View File

@@ -23,9 +23,6 @@
withWebKit ? stdenv.hostPlatform.isDarwin,
webkitgtk_4_1,
libpng,
# TODO: Clean up on `staging`.
llvmPackages,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -48,11 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
./0002-support-webkitgtk-41.patch
];
nativeBuildInputs = [
pkg-config
]
# TODO: Clean up on `staging`.
++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gst_all_1.gst-plugins-base
@@ -96,17 +89,12 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-webviewwebkit"
];
env =
lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
SEARCH_LIB = toString [
"${libGLU.out}/lib"
"${libGL.out}/lib"
];
}
# TODO: Clean up on `staging`.
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_LINK = "-fuse-ld=lld";
};
env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
SEARCH_LIB = toString [
"${libGLU.out}/lib"
"${libGL.out}/lib"
];
};
preConfigure = ''
substituteInPlace configure --replace \

26
pkgs/by-name/wx/wxwidgets_3_2/package.nix
View File

@@ -29,9 +29,6 @@
withMesa ? !stdenv.hostPlatform.isDarwin,
withWebKit ? true,
webkitgtk_4_1,
# TODO: Clean up on `staging`.
llvmPackages,
}:
let
catch = fetchFromGitHub {
@@ -59,11 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-YaQrPJSlTpJKwjXLdRsGB04f7wKJCWfHjXWkB45qyEg=";
};
nativeBuildInputs = [
pkg-config
]
# TODO: Clean up on `staging`.
++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gst_all_1.gst-plugins-base
@@ -121,17 +114,12 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-webviewwebkit"
];
env =
lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
SEARCH_LIB = toString [
"${libGLU.out}/lib"
"${libGL.out}/lib"
];
}
# TODO: Clean up on `staging`.
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_LINK = "-fuse-ld=lld";
};
env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
SEARCH_LIB = toString [
"${libGLU.out}/lib"
"${libGL.out}/lib"
];
};
preConfigure = ''
cp -r ${catch}/* 3rdparty/catch/

26
pkgs/by-name/wx/wxwidgets_3_3/package.nix
View File

@@ -30,9 +30,6 @@
withEGL ? true,
withPrivateFonts ? false,
webkitgtk_4_1,
# TODO: Clean up on `staging`.
llvmPackages,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -47,11 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-gB+mEk8rHpB4z1m8RWJSV+upKzLt7pZtlviS2g03EHY=";
};
nativeBuildInputs = [
pkg-config
]
# TODO: Clean up on `staging`.
++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gst_all_1.gst-plugins-base
@@ -110,17 +103,12 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-webviewwebkit"
];
env =
lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
SEARCH_LIB = toString [
"${libGLU.out}/lib"
"${libGL.out}/lib"
];
}
# TODO: Clean up on `staging`.
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_LINK = "-fuse-ld=lld";
};
env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
SEARCH_LIB = toString [
"${libGLU.out}/lib"
"${libGL.out}/lib"
];
};
postInstall = "
pushd $out/include