diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 18:15:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-01 18:15:13 +0100 |
| commit | 4cc2a38854338ba783fb867ff924200b59867773 (patch) | |
| tree | 5b6c24becb12735ccb81edcb3fdfdd685e582d3d /pkgs/applications/networking | |
| parent | e576535408530584d3590ecbead71d30dbfcfb07 (diff) | |
| parent | f448a79770db137448f12236fc10719ef7389abd (diff) | |
| download | nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.gz nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.bz2 nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.lz nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.xz nixlib-4cc2a38854338ba783fb867ff924200b59867773.tar.zst nixlib-4cc2a38854338ba783fb867ff924200b59867773.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/testssl/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index dc7c961856d6..50ebee4a0ce5 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,7 +1,11 @@ { stdenv, fetchFromGitHub, pkgs }: -stdenv.mkDerivation rec { +let version = "2.9.5-1"; + pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; + opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; + +in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; src = fetchFromGitHub { @@ -17,8 +21,6 @@ stdenv.mkDerivation rec { patches = [ ./testssl.patch ]; - pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; - opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; postPatch = '' sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ |