summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-02-05 13:52:48 +0000
committerGitHub <noreply@github.com>2018-02-05 13:52:48 +0000
commit2bff46d193b92abbdcf903643389e7d715502d0d (patch)
tree077b81d0b1c647a4d3a0bccec3b3d8715991a0c4 /pkgs/applications/misc
parent9accca260e893bd71693f30e12075a37479670a6 (diff)
parentdc5bdf22d91f39e296bfec2cbe82f23ff33afd53 (diff)
downloadnixlib-2bff46d193b92abbdcf903643389e7d715502d0d.tar
nixlib-2bff46d193b92abbdcf903643389e7d715502d0d.tar.gz
nixlib-2bff46d193b92abbdcf903643389e7d715502d0d.tar.bz2
nixlib-2bff46d193b92abbdcf903643389e7d715502d0d.tar.lz
nixlib-2bff46d193b92abbdcf903643389e7d715502d0d.tar.xz
nixlib-2bff46d193b92abbdcf903643389e7d715502d0d.tar.zst
nixlib-2bff46d193b92abbdcf903643389e7d715502d0d.zip
Merge pull request #34593 from taktoa/taktoa/gnuradio-wrapper-fix
gnuradio: fix wrapper
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/gnuradio/wrapper.nix19
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix
index db2b453913f4..ffed3da03187 100644
--- a/pkgs/applications/misc/gnuradio/wrapper.nix
+++ b/pkgs/applications/misc/gnuradio/wrapper.nix
@@ -1,7 +1,6 @@
-{ stdenv, gnuradio, makeWrapper, python
-, extraPackages ? [] }:
+{ stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }:
 
-with stdenv.lib;
+with { inherit (stdenv.lib) appendToName makeSearchPath; };
 
 stdenv.mkDerivation {
   name = (appendToName "with-packages" gnuradio).name;
@@ -11,13 +10,15 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     ln -s "${gnuradio}"/bin/* $out/bin/
 
-    for file in $(find $out/bin -type f -executable); do
-        wrapProgram "$file" \
-            --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
-                                     (map (path: "$(toPythonPath ${path})") extraPackages)} \
-            --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
+    for file in $(find -L $out/bin -type f); do
+        if test -x "$(readlink -f "$file")"; then
+            wrapProgram "$file" \
+                --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
+                                         (map (path: "$(toPythonPath ${path})") extraPackages)} \
+                --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
+        fi
     done
-
   '';
+
   inherit (gnuradio) meta;
 }