pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #182731 from luizribeiro/soapy-pkgcfg

soapysdr: fix pkg-config paths

authored by

markuskowa and committed by
GitHub 8fdd72ac e13fbf4e

+19
unified split
+5
pkgs/applications/radio/soapysdr/default.nix
··· 25 sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2"; 26 }; 27 28 nativeBuildInputs = [ cmake makeWrapper pkg-config ]; 29 buildInputs = [ libusb-compat-0_1 ncurses ] 30 ++ lib.optionals usePython [ python swig2 ];
··· 25 sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2"; 26 }; 27 28 + patches = [ 29 + # see https://github.com/pothosware/SoapySDR/issues/352 for upstream issue 30 + ./fix-pkgconfig.patch 31 + ]; 32 + 33 nativeBuildInputs = [ cmake makeWrapper pkg-config ]; 34 buildInputs = [ libusb-compat-0_1 ncurses ] 35 ++ lib.optionals usePython [ python swig2 ];
+14
pkgs/applications/radio/soapysdr/fix-pkgconfig.patch
···
··· 1 + diff --git a/lib/SoapySDR.in.pc b/lib/SoapySDR.in.pc 2 + index a1ca698..fd2f4c0 100644 3 + --- a/lib/SoapySDR.in.pc 4 + +++ b/lib/SoapySDR.in.pc 5 + @@ -1,7 +1,5 @@ 6 + -prefix=@CMAKE_INSTALL_PREFIX@ 7 + -exec_prefix=${prefix} 8 + -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ 9 + -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ 10 + +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ 11 + +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ 12 + 13 + Name: Soapy SDR 14 + Description: Vendor and platform neutral SDR interface library.