alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #182731 from luizribeiro/soapy-pkgcfg

Browse source 
soapysdr: fix pkg-config paths
This commit is contained in:
markuskowa 2022-07-27 23:12:55 +02:00 committed by GitHub
parent e13fbf4e35 20fb8cb774
commit 8fdd72acc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/radio/soapysdr/default.nix
View file

@ -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 ];

14
pkgs/applications/radio/soapysdr/fix-pkgconfig.patch Normal file
View file

@ -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.