gnuradio: fix makeWrapper calls

This commit is contained in:
Robin Gloster
2017-08-10 03:36:32 +02:00
parent 5f6fe64823
commit ffd46e9bce
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc"
for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do
wrapProgram "$file" \ wrapProgram "$file" \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
--set MATPLOTLIBRC "$out/share/gnuradio" --set MATPLOTLIBRC "$out/share/gnuradio"
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin mkdir -p $out/bin
ln -s "${gnuradio}"/bin/* $out/bin/ ln -s "${gnuradio}"/bin/* $out/bin/
for file in "$out"/bin/*; do for file in $(find $out/bin -type f -executable); do
wrapProgram "$file" \ wrapProgram "$file" \
--prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
(map (path: "$(toPythonPath ${path})") extraPackages)} \ (map (path: "$(toPythonPath ${path})") extraPackages)} \