summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2020-06-15 11:34:38 +0800
committerPeter Hoeg <peter@hoeg.com>2020-06-15 12:18:45 +0800
commit227561d5f829779f6a2b1e0009983f10e83d68fe (patch)
tree1eb293344d2d7accd6fbfd47a25a52d198ef260f
parentlimesuite: use wxGTK30-gtk3 (diff)
downloadnixpkgs-origin/wxgtk_gtk3.tar.gz
cubicsdr: use wxGTK31-gtk3origin/wxgtk_gtk3
-rw-r--r--pkgs/applications/radio/cubicsdr/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix
index ef4d68af54c6..c85299606c03 100644
--- a/pkgs/applications/radio/cubicsdr/default.nix
+++ b/pkgs/applications/radio/cubicsdr/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp,
- pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }:
+ pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }:
stdenv.mkDerivation rec {
pname = "cubicsdr";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK ];
+
+ buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ];
cmakeFlags = [ "-DUSE_HAMLIB=ON" ]
++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96e38d5280b9..1c4282153ab1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19128,7 +19128,7 @@ in
ctop = callPackage ../tools/system/ctop { };
- cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; };
+ cubicsdr = callPackage ../applications/radio/cubicsdr { };
cum = callPackage ../applications/misc/cum { };