diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 20:09:45 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 20:09:45 -0700 |
| commit | d49408401798a6736825c4ac6a9bc0c94c0f335b (patch) | |
| tree | eb0f9bcf9cedafbf1edeaa401cd3774789a52c27 /pkgs/applications/radio | |
| parent | ef4e037e2b3029c6e70433c872c167ef6b78e621 (diff) | |
| parent | 5883668123e7b1563f68daea20761ad34b38c42c (diff) | |
Merge branch 'staging-next' into staging
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022.
Diffstat (limited to 'pkgs/applications/radio')
| -rw-r--r-- | pkgs/applications/radio/limesuite/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index c057fe62f1c60..a08293c8ef731 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake +, fetchpatch , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT @@ -16,6 +17,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-t3v2lhPZ1L/HRRBwA3k1KfIpih6R4TUmBWaIm8sVGdY="; }; + patches = [ + # Pull gcc-13 fix pending upstream inclusion: + # https://github.com/myriadrf/LimeSuite/pull/384 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/myriadrf/LimeSuite/commit/4ab51835d0fde4ffe6b7be2ac3dfa915e7d4d26e.patch"; + hash = "sha256-53nLeluMtTPXxchbpftPE8Z1QMyi0UKp+0nRF4ufUgo="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ |