diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/soapysdr/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/soapysdr/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/misc/soapysdr/default.nix b/nixpkgs/pkgs/applications/misc/soapysdr/default.nix index f14b560bf52c..6754e8f2a55c 100644 --- a/nixpkgs/pkgs/applications/misc/soapysdr/default.nix +++ b/nixpkgs/pkgs/applications/misc/soapysdr/default.nix @@ -6,7 +6,11 @@ } : let - version = "0.7.0"; + + version = "0.7.1"; + modulesVersion = with lib; versions.major version + "." + versions.minor version; + modulesPath = "lib/SoapySDR/modules" + modulesVersion; + extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; in stdenv.mkDerivation { name = "soapysdr-${version}"; @@ -15,11 +19,11 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13"; + sha256 = "1rbnd3w12kzsh94fiywyn4vch7h0kf75m88fi6nq992b3vnmiwvl"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libusb ncurses numpy swig2 python makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + buildInputs = [ libusb ncurses numpy python swig2 ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -31,11 +35,9 @@ in stdenv.mkDerivation { for i in ${toString extraPackages}; do ${lndir}/bin/lndir -silent $i $out done - # Needed for at least the remote plugin server for file in $out/bin/*; do - wrapProgram "$file" \ - --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} + wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${extraPackagesSearchPath} done ''; @@ -47,4 +49,3 @@ in stdenv.mkDerivation { platforms = platforms.linux; }; } - |