ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

soapysdr: fix modules-directory for extraPackages

Browse Source
This commit is contained in:
betaboon 2018-12-29 19:25:28 +01:00
parent 6b1a429df3
commit bb5c86d404
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/soapysdr/default.nix
View File

@ -6,7 +6,11 @@
} : } :
let let
version = "0.7.0"; version = "0.7.0";
modulesVersion = with lib; versions.major version + "." + versions.minor version;
modulesPath = "lib/SoapySDR/modules" + modulesVersion;
extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "soapysdr-${version}"; name = "soapysdr-${version}";
@ -18,8 +22,8 @@ in stdenv.mkDerivation {
sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13"; sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ]; buildInputs = [ libusb ncurses numpy python swig2 ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
@ -31,11 +35,9 @@ in stdenv.mkDerivation {
for i in ${toString extraPackages}; do for i in ${toString extraPackages}; do
${lndir}/bin/lndir -silent $i $out ${lndir}/bin/lndir -silent $i $out
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
wrapProgram "$file" \ wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${extraPackagesSearchPath}
--prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages}
done done
''; '';
@ -47,4 +49,3 @@ in stdenv.mkDerivation {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }