diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-06-15 11:01:25 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2020-06-15 11:01:25 +0800 |
| commit | 7439aad737c00915ecc09703ba65721d0513f563 (patch) | |
| tree | b837dde30ccb319bf755b408dab6e10b002e9bb3 /pkgs/top-level/all-packages.nix | |
| parent | 0a146054bdf6f70f66de4426f84c9358521be31e (diff) | |
| download | nixlib-7439aad737c00915ecc09703ba65721d0513f563.tar nixlib-7439aad737c00915ecc09703ba65721d0513f563.tar.gz nixlib-7439aad737c00915ecc09703ba65721d0513f563.tar.bz2 nixlib-7439aad737c00915ecc09703ba65721d0513f563.tar.lz nixlib-7439aad737c00915ecc09703ba65721d0513f563.tar.xz nixlib-7439aad737c00915ecc09703ba65721d0513f563.tar.zst nixlib-7439aad737c00915ecc09703ba65721d0513f563.zip | |
wxGTK3: make gtk2 and gtk3 specific variants
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 934575e01ecf..7e98b1f9c18d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15139,6 +15139,9 @@ in wxGTK = wxGTK28; + wxGTK30 = wxGTK30-gtk2; + wxGTK31 = wxGTK31-gtk2; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { inherit (gnome2) GConf; }; @@ -15149,18 +15152,32 @@ in inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; - wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 { + wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { + withGtk2 = true; inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 { + wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { + withGtk2 = false; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + + wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { + withGtk2 = true; inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; + wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 { + withGtk2 = false; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; |