git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #53051 from betaboon/patch-2

soapysdr: fix modules-directory for extraPackages

commitcecec1f74468766825c2ad32d8388c2ded36225f authormarkuskowa <markus.kowalewski@gmail.com> dateMon 7 Jan 2019, 22:06 (8 years ago) parentf11b1acbb5c86d
1 file changed+7−6
pkgs/applications/misc/soapysdr/default.nix+7−6
pkgs/applications/misc/soapysdr/default.nix+7−6
@@ -6,7 +6,11 @@
66} :
77
88let
9+
910 version = "0.7.0";
11+ modulesVersion = with lib; versions.major version + "." + versions.minor version;
12+ modulesPath = "lib/SoapySDR/modules" + modulesVersion;
13+ extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages;
1014
1115in stdenv.mkDerivation {
1216 name = "soapysdr-${version}";
@@ -18,8 +22,8 @@ in stdenv.mkDerivation {
1822 sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13";
1923 };
2024
21− nativeBuildInputs = [ cmake pkgconfig ];
22− buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ];
25+ nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
26+ buildInputs = [ libusb ncurses numpy python swig2 ];
2327
2428 cmakeFlags = [
2529 "-DCMAKE_BUILD_TYPE=Release"
@@ -31,11 +35,9 @@ in stdenv.mkDerivation {
3135 for i in ${toString extraPackages}; do
3236 ${lndir}/bin/lndir -silent $i $out
3337 done
34−
3538 # Needed for at least the remote plugin server
3639 for file in $out/bin/*; do
37− wrapProgram "$file" \
38− --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages}
40+ wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${extraPackagesSearchPath}
3941 done
4042 '';
4143
@@ -47,4 +49,3 @@ in stdenv.mkDerivation {
4749 platforms = platforms.linux;
4850 };
4951}
50−