Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wxGTK31: 3.1.2 -> 3.1.3 #87810

Merged
merged 2 commits into from Jul 20, 2020
Merged

wxGTK31: 3.1.2 -> 3.1.3 #87810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6383a04
Allow cubicsdr 0.2.5 to build with wxGTK 3.1.3
evils May 14, 2020
e1f5467
wxGTK31: 3.1.2 -> 3.1.3
evils May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 18 additions & 1 deletion pkgs/applications/radio/cubicsdr/default.nix
View file
Open in desktop
@@ -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 {
Expand All @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/wxwidgets/3.1/default.nix
View file
Open in desktop
Expand Up @@ -18,14 +18,14 @@ assert withWebKit -> webkitgtk != null;
assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2.";

stdenv.mkDerivation rec {
version = "3.1.2";
version = "3.1.3";
pname = "wxwidgets";

src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
sha256 = "0gfdhb7xq5vzasm7s1di39nchv42zsp0dmn4v6knzb7mgsb107wb";
sha256 = "022mby78q7n0bhd4mph04hz93c9qamnvzv3h1s26r839k28760f4";
};

buildInputs = [
Expand Down