Merge pull request #52546 from betaboon/patch-2

soapysdr: fix extraPackages support
This commit is contained in:
markuskowa
2018-12-20 10:30:20 +01:00
committed by GitHub
+3 -3
View File
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libusb ncurses numpy swig2 python ]; buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
@@ -33,8 +33,8 @@ in stdenv.mkDerivation {
done done
# Needed for at least the remote plugin server # Needed for at least the remote plugin server
for file in out/bin/*; do for file in $out/bin/*; do
${makeWrapper}/bin/wrapProgram "$file" \ wrapProgram "$file" \
--prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages}
done done
''; '';