Skip to content

Commit 23a039a

Browse files
committed
Avoid double wrapper and fix #779
1 parent a6e6089 commit 23a039a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

release.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ rec {
108108
# Needed by libcloud during tests
109109
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
110110

111+
# Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
112+
# the version of openssh is causing errors when have big networks (40+)
113+
makeWrapperArgs = ["--prefix" "PATH" ":" "${openssl}/bin" "--set" "PYTHONPATH" ":"];
114+
111115
postInstall =
112116
''
113117
# Backward compatibility symlink.
@@ -118,11 +122,7 @@ rec {
118122
119123
mkdir -p $out/share/nix/nixops
120124
cp -av nix/* $out/share/nix/nixops
121-
122-
# Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
123-
# the version of openssh is causing errors when have big networks (40+)
124-
wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
125-
''; # */
125+
'';
126126

127127
meta.description = "Nix package for ${stdenv.system}";
128128
});

0 commit comments

Comments
 (0)