summary refs log tree commit diff
diff options
context:
space:
mode:
authorsuperherointj <5861043+superherointj@users.noreply.github.com>2023-02-15 20:35:20 -0300
committersuperherointj <5861043+superherointj@users.noreply.github.com>2023-02-15 20:35:20 -0300
commit4b1018ba0a50fcebdd98f4103cf1a489302cd3ba (patch)
treee2a0ed90d0c7e5768bfd15a8b0434e68d9918d1a
parent0617712c14133397dcc7e2dd4cac2c1bdf12ea6a (diff)
downloadnixpkgs-4b1018ba0a50fcebdd98f4103cf1a489302cd3ba.tar
nixpkgs-4b1018ba0a50fcebdd98f4103cf1a489302cd3ba.tar.gz
nixpkgs-4b1018ba0a50fcebdd98f4103cf1a489302cd3ba.tar.bz2
nixpkgs-4b1018ba0a50fcebdd98f4103cf1a489302cd3ba.tar.lz
nixpkgs-4b1018ba0a50fcebdd98f4103cf1a489302cd3ba.tar.xz
nixpkgs-4b1018ba0a50fcebdd98f4103cf1a489302cd3ba.tar.zst
nixpkgs-4b1018ba0a50fcebdd98f4103cf1a489302cd3ba.zip
pkgsMusl.wxwidgets: fix build
-rw-r--r--pkgs/development/libraries/wxwidgets/wxGTK32.nix10
1 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
index 83154c50d3e..8dbc6f87061 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix
@@ -62,16 +62,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA=";
   };
 
-  # Workaround for pkgsMusl.wxGTK32 failing as:
-  #   "./src/unix/uilocale.cpp:650:37: error: ‘_NL_IDENTIFICATION_TERRITORY’ was not declared in this scope"
-  # On upgrade, please test building wxwidgets for pkgsMusl, and remove this patch if unnecessary.
-  patches = lib.optional stdenv.hostPlatform.isMusl [
-    (fetchpatch {
-      url = "https://github.com/wxWidgets/wxWidgets/commit/1faf1796b23b2503296d9b1e9ad39047d633f8c9.patch";
-      sha256 = "sha256-0FbfzGzzkriLD2iDcRcBXgYqjHtxFsmSlhGE5d18/bo=";
-    })
-  ];
-
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [