@@ -15145,6 +15145,9 @@ in
1514515145
1514615146 wxGTK = wxGTK28;
1514715147
15148+ wxGTK30 = wxGTK30-gtk2;
15149+ wxGTK31 = wxGTK31-gtk2;
15150+
1514815151 wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
1514915152 inherit (gnome2) GConf;
1515015153 };
@@ -15155,18 +15158,32 @@ in
1515515158 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
1515615159 };
1515715160
15158− wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 {
15161+ wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
15162+ withGtk2 = true;
1515915163 inherit (gnome2) GConf;
1516015164 inherit (darwin.stubs) setfile;
1516115165 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
1516215166 };
1516315167
15164− wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {
15168+ wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 {
15169+ withGtk2 = false;
15170+ inherit (darwin.stubs) setfile;
15171+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
15172+ };
15173+
15174+ wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
15175+ withGtk2 = true;
1516515176 inherit (gnome2) GConf;
1516615177 inherit (darwin.stubs) setfile;
1516715178 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
1516815179 };
1516915180
15181+ wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 {
15182+ withGtk2 = false;
15183+ inherit (darwin.stubs) setfile;
15184+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
15185+ };
15186+
1517015187 wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
1517115188 inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
1517215189 inherit (darwin.stubs) setfile rez derez;
@@ -19120,7 +19137,7 @@ in
1912019137
1912119138 ctop = callPackage ../tools/system/ctop { };
1912219139
19123− cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; };
19140+ cubicsdr = callPackage ../applications/radio/cubicsdr { };
1912419141
1912519142 cum = callPackage ../applications/misc/cum { };
1912619143
@@ -22187,9 +22204,7 @@ in
2218722204
2218822205 soxr = callPackage ../applications/misc/audio/soxr { };
2218922206
22190− spek = callPackage ../applications/audio/spek {
22191− ffmpeg = ffmpeg_2;
22192− };
22207+ spek = callPackage ../applications/audio/spek { };
2219322208
2219422209 spotify = callPackage ../applications/audio/spotify {
2219522210 libgcrypt = libgcrypt_1_5;