diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2022-07-27 23:12:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 23:12:55 +0200 |
| commit | 8fdd72acc37481a1d70d4003392a9a5e0c559cde (patch) | |
| tree | e491967b9f15f9858a117d6eff823dbe6863e2cd /pkgs/applications/radio | |
| parent | e13fbf4e3574900418ddc7d7934b038e1f37a827 (diff) | |
| parent | 20fb8cb774f14c67998dc7957a8f473471fbd7a9 (diff) | |
| download | nixlib-8fdd72acc37481a1d70d4003392a9a5e0c559cde.tar nixlib-8fdd72acc37481a1d70d4003392a9a5e0c559cde.tar.gz nixlib-8fdd72acc37481a1d70d4003392a9a5e0c559cde.tar.bz2 nixlib-8fdd72acc37481a1d70d4003392a9a5e0c559cde.tar.lz nixlib-8fdd72acc37481a1d70d4003392a9a5e0c559cde.tar.xz nixlib-8fdd72acc37481a1d70d4003392a9a5e0c559cde.tar.zst nixlib-8fdd72acc37481a1d70d4003392a9a5e0c559cde.zip | |
Merge pull request #182731 from luizribeiro/soapy-pkgcfg
soapysdr: fix pkg-config paths
Diffstat (limited to 'pkgs/applications/radio')
| -rw-r--r-- | pkgs/applications/radio/soapysdr/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/radio/soapysdr/fix-pkgconfig.patch | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 1e5052d4f9be..422e665b9372 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -25,6 +25,11 @@ in stdenv.mkDerivation { sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2"; }; + patches = [ + # see https://github.com/pothosware/SoapySDR/issues/352 for upstream issue + ./fix-pkgconfig.patch + ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; diff --git a/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch b/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch new file mode 100644 index 000000000000..d4b15e3f99bc --- /dev/null +++ b/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/lib/SoapySDR.in.pc b/lib/SoapySDR.in.pc +index a1ca698..fd2f4c0 100644 +--- a/lib/SoapySDR.in.pc ++++ b/lib/SoapySDR.in.pc +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: Soapy SDR + Description: Vendor and platform neutral SDR interface library. |