diff options
author | Peter Hoeg <peter@hoeg.com> | 2020-07-20 22:03:16 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-20 22:03:16 +0800 |
commit | ee8b7b45668d6411c6720cb78c0ed395342cebeb (patch) | |
tree | 94e24c6285154e021fd14d85d6525c6a4eb78fd9 /pkgs/applications | |
parent | e8388cb5964798a893d09c6f76dbda8e608d2a78 (diff) | |
parent | e1f5467ea5c41cfc1b16a3497019b3a58db90fc6 (diff) |
Merge pull request #87810 from evils/wxwidgets-3.1.3
wxGTK31: 3.1.2 -> 3.1.3
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/radio/cubicsdr/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index c85299606c036..c0dd4346d40a5 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, +{ stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { @@ -12,6 +12,23 @@ stdenv.mkDerivation rec { sha256 = "1ihbn18bzdcdvwpa4hnb55ns38bj4b8xy53hkmra809f9qpbcjhn"; }; + # Allow cubicsdr 0.2.5 to build with wxGTK 3.1.3 + # these come from cubicsdr's master branch, subsequent releases may include them + patches = [ + (fetchpatch { + url = "https://github.com/cjcliffe/CubicSDR/commit/65a160fa356ce9665dfe05c6bfc6754535e16743.patch"; + sha256 = "0vbr5x9fnm09bws5crqcm6kkhr1bg5r0bc1pxnwwjyc6jpvqi6ad"; + }) + (fetchpatch { + url = "https://github.com/cjcliffe/CubicSDR/commit/f449a65457e35bf8260d0b16b8a47b6bc0ea2c7e.patch"; + sha256 = "1zjvjmhm8ybi6i9pq7by3fj3mvx37dy7gj4gk23d79yrnl9mk25p"; + }) + (fetchpatch { + url = "https://github.com/cjcliffe/CubicSDR/commit/0540d08c2dea79b668b32b1a6d58f235d65ce9d2.patch"; + sha256 = "07l7b82f779sbcj0jza0mg463ac1153bs9hn6ai388j7dm3lvasn"; + }) + ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; |