From f3ec623b7048da2252572f19c72233b1312d941a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 27 Dec 2017 13:23:59 +0100 Subject: [PATCH] testssl: refactor and improve expression --- pkgs/applications/networking/testssl/default.nix | 8 +++++--- 1 file 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" \