Merge pull request #34593 from taktoa/taktoa/gnuradio-wrapper-fix

gnuradio: fix wrapper
This commit is contained in:
Andreas Rammhold 2018-02-05 13:52:48 +00:00 committed by GitHub
commit 2bff46d193
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ stdenv, gnuradio, makeWrapper, python { stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }:
, extraPackages ? [] }:
with stdenv.lib; with { inherit (stdenv.lib) appendToName makeSearchPath; };
stdenv.mkDerivation { stdenv.mkDerivation {
name = (appendToName "with-packages" gnuradio).name; name = (appendToName "with-packages" gnuradio).name;
@ -11,13 +10,15 @@ 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 $(find $out/bin -type f -executable); do for file in $(find -L $out/bin -type f); do
wrapProgram "$file" \ if test -x "$(readlink -f "$file")"; then
--prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" wrapProgram "$file" \
(map (path: "$(toPythonPath ${path})") extraPackages)} \ --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
--prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} (map (path: "$(toPythonPath ${path})") extraPackages)} \
--prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
fi
done done
''; '';
inherit (gnuradio) meta; inherit (gnuradio) meta;
} }