public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33105 from etu/testssl-fixups

Browse Source 
testssl: refactor and improve expression
This commit is contained in:
adisbladis 2018-01-01 17:39:28 +01:00 committed by GitHub
commit 4fe3297686
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/testssl/default.nix
View File

@ -1,7 +1,11 @@
{ stdenv, fetchFromGitHub, pkgs }: { stdenv, fetchFromGitHub, pkgs }:
stdenv.mkDerivation rec { let
version = "2.9.5-1"; 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}"; name = "testssl.sh-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -17,8 +21,6 @@ stdenv.mkDerivation rec {
patches = [ ./testssl.patch ]; patches = [ ./testssl.patch ];
pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
postPatch = '' postPatch = ''
sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \
-e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \