JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxwidgets: rename files

Browse Source
This commit is contained in:
AndersonTorres 2022-02-03 01:48:58 -03:00
parent f4d364314b
commit 4bcf0dcf8d
6 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/wxwidgets/2.8/default.nix → pkgs/development/libraries/wxwidgets/wxGTK28.nix
View File

2
pkgs/development/libraries/wxwidgets/2.9/default.nix → pkgs/development/libraries/wxwidgets/wxGTK29.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
../0001-fix-assertion-using-hide-in-destroy.patch
./0001-fix-assertion-using-hide-in-destroy.patch
];
nativeBuildInputs = [

2
pkgs/development/libraries/wxwidgets/3.0/default.nix → pkgs/development/libraries/wxwidgets/wxGTK30.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
../0001-fix-assertion-using-hide-in-destroy.patch
./0001-fix-assertion-using-hide-in-destroy.patch
];
configureFlags = [

7
pkgs/development/libraries/wxwidgets/3.1/default.nix → pkgs/development/libraries/wxwidgets/wxGTK31.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/wxWidgets/wxWidgets/issues/17942
../0001-fix-assertion-using-hide-in-destroy.patch
./0001-fix-assertion-using-hide-in-destroy.patch
];
nativeBuildInputs = [ pkg-config ];
@ -138,13 +138,12 @@ stdenv.mkDerivation rec {
'';
license = licenses.wxWindows;
maintainers = with maintainers; [ AndersonTorres tfmoraes ];
platforms = platforms.linux ++ platforms.darwin;
broken = stdenv.isDarwin; # ofBorg is failing, don't know if internal
platforms = platforms.unix;
badPlatforms = platforms.darwin; # ofBorg is failing, don't know if internal
};
passthru = {
inherit gtk;
inherit compat28 compat30 unicode;
};
}

0
pkgs/development/libraries/wxwidgets/3.0/mac.nix → pkgs/development/libraries/wxwidgets/wxmac30.nix
View File

31
pkgs/top-level/all-packages.nix
View File

@ -20544,30 +20544,17 @@ with pkgs;
wxGTK = wxGTK28;
wxGTK30 = wxGTK30-gtk2;
wxGTK31 = wxGTK31-gtk2;
wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { };
wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { };
wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { };
wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { };
wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { };
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; };
wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { };
wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = true;
};
wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = false;
};
wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
withGtk2 = true;
};
wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 {
withGtk2 = false;
};
wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { };
wxGTK31-gtk2 = wxGTK30.override { withGtk2 = true; };
wxGTK31-gtk3 = wxGTK30.override { withGtk2 = false; };
wxSVG = callPackage ../development/libraries/wxSVG {
wxGTK = wxGTK30-gtk3;