diff options
| author | Robin Gloster <mail@glob.in> | 2017-08-10 03:36:10 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-10 03:36:32 +0200 |
| commit | ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc (patch) | |
| tree | e7eae70fb94d13c07f3fbbcd33b2511f819273b5 | |
| parent | 5f6fe648230d0e2997ec7ec627b76349ca1d0788 (diff) | |
| download | nixpkgs-ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc.tar nixpkgs-ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc.tar.gz nixpkgs-ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc.tar.bz2 nixpkgs-ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc.tar.lz nixpkgs-ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc.tar.xz nixpkgs-ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc.tar.zst nixpkgs-ffd46e9bce2d4e10ddfa57ec5f517e8bee99efdc.zip | |
gnuradio: fix makeWrapper calls
| -rw-r--r-- | pkgs/applications/misc/gnuradio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/gnuradio/wrapper.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 8218285c5fb..e10cb30d187 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { postInstall = '' 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" \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --set MATPLOTLIBRC "$out/share/gnuradio" diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix index cc8dbde273b..db2b453913f 100644 --- a/pkgs/applications/misc/gnuradio/wrapper.nix +++ b/pkgs/applications/misc/gnuradio/wrapper.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation { mkdir -p $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" \ --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") extraPackages)} \ + (map (path: "$(toPythonPath ${path})") extraPackages)} \ --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} done |