diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-27 09:24:31 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-27 09:24:31 +0100 |
commit | 1316edc465ed7b2d650ba8be6a1a0b129926bd81 (patch) | |
tree | 73c74005228bc7707b50e7dcf0d44d0ea40e7d67 /pkgs/development/libraries/wxwidgets | |
parent | 3f6ab5a550c187aafef309aadb88c2bf4e733032 (diff) | |
parent | d8e40250665ef073afc1d208f9f911c2fd4ab397 (diff) | |
download | nixlib-1316edc465ed7b2d650ba8be6a1a0b129926bd81.tar nixlib-1316edc465ed7b2d650ba8be6a1a0b129926bd81.tar.gz nixlib-1316edc465ed7b2d650ba8be6a1a0b129926bd81.tar.bz2 nixlib-1316edc465ed7b2d650ba8be6a1a0b129926bd81.tar.lz nixlib-1316edc465ed7b2d650ba8be6a1a0b129926bd81.tar.xz nixlib-1316edc465ed7b2d650ba8be6a1a0b129926bd81.tar.zst nixlib-1316edc465ed7b2d650ba8be6a1a0b129926bd81.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
-rw-r--r-- | pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch (renamed from pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK28.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK29.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK30.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/wxwidgets/wxGTK31.nix | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch index ca9eb8bf612a..ca9eb8bf612a 100644 --- a/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch +++ b/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch diff --git a/pkgs/development/libraries/wxwidgets/wxGTK28.nix b/pkgs/development/libraries/wxwidgets/wxGTK28.nix index 452d7160c633..b577e5248203 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK28.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK28.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/pkgs/development/libraries/wxwidgets/wxGTK29.nix index 47724fe537d4..097cce6109cb 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK29.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK29.nix @@ -14,12 +14,12 @@ , compat26 ? true , unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, setfile , AGL , Carbon , Cocoa , Kernel , QuickTime +, setfile }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ./0001-fix-assertion-using-hide-in-destroy.patch + ./patches/0001-fix-assertion-using-hide-in-destroy.patch ]; nativeBuildInputs = [ @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.darwin ++ platforms.linux; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 7fad497c9cec..6157786a5d04 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -17,12 +17,12 @@ , unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, setfile , AGL , Carbon , Cocoa , Kernel , QTKit +, setfile }: assert withGtk2 -> (!withWebKit); @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ./0001-fix-assertion-using-hide-in-destroy.patch + ./patches/0001-fix-assertion-using-hide-in-destroy.patch ]; configureFlags = [ @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 181869075a2e..b84b771312fd 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ./0001-fix-assertion-using-hide-in-destroy.patch + ./patches/0001-fix-assertion-using-hide-in-destroy.patch ]; nativeBuildInputs = [ pkg-config ]; |