diff --git a/pkgs/by-name/wx/wxwidgets_3_1/package.nix b/pkgs/by-name/wx/wxwidgets_3_1/package.nix index bea53d1e25e1..17b1d60e360f 100644 --- a/pkgs/by-name/wx/wxwidgets_3_1/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_1/package.nix @@ -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 \ diff --git a/pkgs/by-name/wx/wxwidgets_3_2/package.nix b/pkgs/by-name/wx/wxwidgets_3_2/package.nix index 164911b73410..0b1edf024fd9 100644 --- a/pkgs/by-name/wx/wxwidgets_3_2/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_2/package.nix @@ -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/ diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index d7e649b1e8ea..d15b0a4de841 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -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