From bb5c86d4040c21d01c2e03a554da87185a34b5ed Mon Sep 17 00:00:00 2001
From: betaboon <betaboon@0x80.ninja>
Date: Sat, 29 Dec 2018 19:25:28 +0100
Subject: [PATCH] soapysdr: fix modules-directory for extraPackages

---
 pkgs/applications/misc/soapysdr/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix
index f14b560bf52c..5a79e9d52a0c 100644
--- a/pkgs/applications/misc/soapysdr/default.nix
+++ b/pkgs/applications/misc/soapysdr/default.nix
@@ -6,7 +6,11 @@
 } :
 
 let
+
   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 {
   name = "soapysdr-${version}";
@@ -18,8 +22,8 @@ in stdenv.mkDerivation {
     sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13";
   };
 
-  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;
   };
 }
-