summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2021-06-17 20:40:12 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2021-06-17 20:40:12 +0200
commit79ebd1af69c3ff803068c600a09e5be004d6c937 (patch)
tree4ae6a56aa5fdde6ac9026107aa5f16033f5a730f
parent4109b119c20bd6b3aec646a945ea5f32e1146894 (diff)
downloadnixpkgs-79ebd1af69c3ff803068c600a09e5be004d6c937.tar
nixpkgs-79ebd1af69c3ff803068c600a09e5be004d6c937.tar.gz
nixpkgs-79ebd1af69c3ff803068c600a09e5be004d6c937.tar.bz2
nixpkgs-79ebd1af69c3ff803068c600a09e5be004d6c937.tar.lz
nixpkgs-79ebd1af69c3ff803068c600a09e5be004d6c937.tar.xz
nixpkgs-79ebd1af69c3ff803068c600a09e5be004d6c937.tar.zst
nixpkgs-79ebd1af69c3ff803068c600a09e5be004d6c937.zip
expect: fix wrapping after tcl refactor
-rw-r--r--pkgs/tools/misc/expect/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index 03e8e260ac6..5a792c040b3 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -25,10 +25,9 @@ tcl.mkTclDerivation rec {
   strictDeps = true;
   hardeningDisable = [ "format" ];
 
-  postInstall = lib.optionalString stdenv.isDarwin ''
-    for i in $out/bin/*; do
-      wrapProgram $i --prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}
-    done
+  postInstall = ''
+    tclWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ tcl ]})
+    ${lib.optionalString stdenv.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"}
   '';
 
   outputs = [ "out" "dev" ];