git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #90428 from NixOS/wxgtk_gtk3

wxGTK3: make gtk2 and gtk3 specific variants

commit6d95cf3de40fc6df4274d7795f2f3e11b01c0506 authorPeter Hoeg <peter@hoeg.com> dateTue 16 Jun 2020, 06:31 (6 years ago) parentc09eb57227561d
7 files changed+65−54
pkgs/applications/audio/spek/default.nix+13−12 pkgs/applications/networking/ftp/filezilla/default.nix+3−9 pkgs/applications/radio/cubicsdr/default.nix+3−2 pkgs/applications/radio/limesuite/default.nix+10−14 pkgs/development/libraries/wxwidgets/3.0/default.nix+8−6 pkgs/development/libraries/wxwidgets/3.1/default.nix+7−5 pkgs/top-level/all-packages.nix+21−6
pkgs/applications/audio/spek/default.nix+13−12
@@ -1,27 +1,28 @@
1−{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "spek";
5− version = "0.8.3";
5+ version = "unstable-2018-12-29";
66
7− src = fetchzip {
8− name = "${pname}-${version}-src";
9− url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz";
10− sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
7+ src = fetchFromGitHub {
8+ owner = "alexkay";
9+ repo = "spek";
10+ rev = "f071c2956176ad53c7c8059e5c00e694ded31ded";
11+ sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5";
1112 };
1213
13− nativeBuildInputs = [ pkgconfig ];
14− buildInputs = [ autoconf automake intltool ffmpeg wxGTK ];
14+ # needed for autoreconfHook
15+ AUTOPOINT="intltoolize --automake --copy";
1516
16− preConfigure = ''
17− ./autogen.sh
18− '';
17+ nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];
18+
19+ buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ];
1920
2021 meta = with stdenv.lib; {
2122 description = "Analyse your audio files by showing their spectrogram";
2223 homepage = "http://spek.cc/";
2324 license = licenses.gpl3;
25+ maintainers = with maintainers; [ bjornfor ];
2426 platforms = platforms.all;
25− maintainers = [ maintainers.bjornfor ];
2627 };
2728}
pkgs/applications/networking/ftp/filezilla/default.nix+3−9
@@ -10,16 +10,10 @@
1010, pugixml
1111, sqlite
1212, tinyxml
13−, wxGTK30
13+, wxGTK30-gtk3
1414, xdg_utils
1515}:
1616
17−let
18− # we can drop this when wxgtk is built with gtk3 by default
19− # see: https://github.com/NixOS/nixpkgs/pull/73145
20− wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; };
21−
22−in
2317stdenv.mkDerivation rec {
2418 pname = "filezilla";
2519 version = "3.48.1";
@@ -52,8 +46,8 @@ stdenv.mkDerivation rec {
5246 pugixml
5347 sqlite
5448 tinyxml
55− wxgtk'
56− wxgtk'.gtk
49+ wxGTK30-gtk3
50+ wxGTK30-gtk3.gtk
5751 xdg_utils
5852 ];
5953
pkgs/applications/radio/cubicsdr/default.nix+3−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp,
2− pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }:
2+ pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }:
33
44stdenv.mkDerivation rec {
55 pname = "cubicsdr";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [ cmake pkgconfig ];
16− buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK ];
16+
17+ buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ];
1718
1819 cmakeFlags = [ "-DUSE_HAMLIB=ON" ]
1920 ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
pkgs/applications/radio/limesuite/default.nix+10−14
@@ -1,14 +1,11 @@
11{ stdenv, fetchFromGitHub, cmake
2−, sqlite, wxGTK30, libusb1, soapysdr
2+, sqlite, wxGTK30-gtk3, libusb1, soapysdr
33, mesa_glu, libX11, gnuplot, fltk
44} :
55
6−let
7− version = "20.01.0";
8−
9−in stdenv.mkDerivation {
6+stdenv.mkDerivation rec {
107 pname = "limesuite";
11− inherit version;
8+ version = "20.01.0";
129
1310 src = fetchFromGitHub {
1411 owner = "myriadrf";
@@ -17,14 +14,16 @@ in stdenv.mkDerivation {
1714 sha256 = "01z4idcby2lm34bbnpbp400ski7p61jjiir6sy6dalnvsl52m7vx";
1815 };
1916
20− enableParallelBuilding = true;
21−
2217 nativeBuildInputs = [ cmake ];
2318
19+ cmakeFlags = [
20+ "-DOpenGL_GL_PREFERENCE=GLVND"
21+ ];
22+
2423 buildInputs = [
2524 libusb1
2625 sqlite
27− wxGTK30
26+ wxGTK30-gtk3
2827 fltk
2928 gnuplot
3029 libusb1
@@ -34,11 +33,8 @@ in stdenv.mkDerivation {
3433 ];
3534
3635 postInstall = ''
37− mkdir -p $out/lib/udev/rules.d
38− cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d
39−
40− mkdir -p $out/share/limesuite
41− cp bin/Release/lms7suite_mcu/* $out/share/limesuite
36+ install -Dm444 -t $out/lib/udev/rules.d ../udev-rules/64-limesuite.rules
37+ install -Dm444 -t $out/share/limesuite bin/Release/lms7suite_mcu/*
4238 '';
4339
4440 meta = with stdenv.lib; {
pkgs/development/libraries/wxwidgets/3.0/default.nix+8−6
@@ -1,8 +1,9 @@
11{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
2−, gtk2, gtk3, libXinerama, libSM, libXxf86vm
3−, xorgproto, gstreamer, gst-plugins-base, GConf, setfile
2+, libXinerama, libSM, libXxf86vm
3+, gtk2, GConf ? null, gtk3
4+, xorgproto, gstreamer, gst-plugins-base, setfile
45, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
5−, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
6+, withMesa ? libGLSupported
67, libGLU ? null, libGL ? null
78, compat24 ? false, compat26 ? true, unicode ? true
89, withGtk2 ? true
@@ -28,9 +29,10 @@ stdenv.mkDerivation rec {
2829 sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
2930 };
3031
31− buildInputs =
32− [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
33− gst-plugins-base GConf ]
32+ buildInputs = [
33+ libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base
34+ ] ++ optionals withGtk2 [ gtk2 GConf ]
35+ ++ optional (!withGtk2) gtk3
3436 ++ optional withMesa libGLU
3537 ++ optional withWebKit webkitgtk
3638 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
pkgs/development/libraries/wxwidgets/3.1/default.nix+7−5
@@ -1,6 +1,7 @@
11{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
2−, gtk2, gtk3, libXinerama, libSM, libXxf86vm
3−, xorgproto, gstreamer, gst-plugins-base, GConf, setfile
2+, libXinerama, libSM, libXxf86vm
3+, gtk2, GConf ? null, gtk3
4+, xorgproto, gstreamer, gst-plugins-base, setfile
45, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
56, withMesa ? libGLSupported, libGLU ? null, libGL ? null
67, compat28 ? false, compat30 ? true, unicode ? true
@@ -27,9 +28,10 @@ stdenv.mkDerivation rec {
2728 sha256 = "0gfdhb7xq5vzasm7s1di39nchv42zsp0dmn4v6knzb7mgsb107wb";
2829 };
2930
30− buildInputs =
31− [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
32− gst-plugins-base GConf ]
31+ buildInputs = [
32+ libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base
33+ ] ++ optionals withGtk2 [ gtk2 GConf ]
34+ ++ optional (!withGtk2) gtk3
3335 ++ optional withMesa libGLU
3436 ++ optional withWebKit webkitgtk
3537 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
pkgs/top-level/all-packages.nix+21−6
@@ -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;