summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuiz Ribeiro <luizribeiro@gmail.com>2022-07-24 13:55:23 -0500
committerLuiz Ribeiro <luizribeiro@gmail.com>2022-07-24 13:59:31 -0500
commit20fb8cb774f14c67998dc7957a8f473471fbd7a9 (patch)
tree5085123183012efb988404e1f5e62e931b3dffc8
parent92dd57f4afe6476b847b9e3b5b2b15a496d8da64 (diff)
downloadnixpkgs-20fb8cb774f14c67998dc7957a8f473471fbd7a9.tar
nixpkgs-20fb8cb774f14c67998dc7957a8f473471fbd7a9.tar.gz
nixpkgs-20fb8cb774f14c67998dc7957a8f473471fbd7a9.tar.bz2
nixpkgs-20fb8cb774f14c67998dc7957a8f473471fbd7a9.tar.lz
nixpkgs-20fb8cb774f14c67998dc7957a8f473471fbd7a9.tar.xz
nixpkgs-20fb8cb774f14c67998dc7957a8f473471fbd7a9.tar.zst
nixpkgs-20fb8cb774f14c67998dc7957a8f473471fbd7a9.zip
soapysdr: fix pkg-config paths
-rw-r--r--pkgs/applications/radio/soapysdr/default.nix5
-rw-r--r--pkgs/applications/radio/soapysdr/fix-pkgconfig.patch14
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 1e5052d4f9b..422e665b937 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 00000000000..d4b15e3f99b
--- /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.