cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52546 from betaboon/patch-2

Browse source 
soapysdr: fix extraPackages support
This commit is contained in:
markuskowa 2018-12-20 10:30:20 +01:00 committed by GitHub
commit 88d52d89e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/soapysdr/default.nix
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
''; '';