swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38466 from thefloweringash/apg-unix

Browse source 
apg: Darwin support
This commit is contained in:
Daiderd Jordan 2018-04-05 19:12:48 +02:00 committed by GitHub
parent 05f175e06a b206311c80
commit c45eadf31d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/security/apg/default.nix
View file

@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
''; '';
makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"];
patches = [ ./apg.patch ]; patches = [
./apg.patch
./phony-install-target.patch
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile
@ -64,6 +67,6 @@ stdenv.mkDerivation rec {
homepage = http://www.adel.nursat.kz/apg/; homepage = http://www.adel.nursat.kz/apg/;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ astsmtl ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

11
pkgs/tools/security/apg/phony-install-target.patch Normal file
View file

@ -0,0 +1,11 @@
diff -ur a/Makefile b/Makefile
--- a/Makefile 2003-08-08 00:40:39.000000000 +0900
+++ b/Makefile 2018-04-05 22:29:39.284191020 +0900
@@ -142,6 +142,7 @@
strip ${CS_PROGNAME}
strip ${BFM_PROGNAME}
+.PHONY: install
install:
if test -x ./apg; then \
./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \