diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2018-04-05 22:33:50 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2018-04-05 22:35:09 +0900 |
| commit | 7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6 (patch) | |
| tree | 83ad88705cdb0ce1c6018b5f43d448409e9e0671 /pkgs/tools/security/apg | |
| parent | 7f92e3b6bfbb35b53ffcdb3ee56f87c7adb31433 (diff) | |
| download | nixpkgs-7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6.tar nixpkgs-7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6.tar.gz nixpkgs-7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6.tar.bz2 nixpkgs-7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6.tar.lz nixpkgs-7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6.tar.xz nixpkgs-7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6.tar.zst nixpkgs-7d55577852eac2c9c161b3a4daeec0fc6c3a2ef6.zip | |
apg: Fix build on case insensitive filesystems
Diffstat (limited to 'pkgs/tools/security/apg')
| -rw-r--r-- | pkgs/tools/security/apg/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/security/apg/phony-install-target.patch | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 04b29bcf8f7..f63629c6667 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { ''; makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; - patches = [ ./apg.patch ]; + patches = [ + ./apg.patch + ./phony-install-target.patch + ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile diff --git a/pkgs/tools/security/apg/phony-install-target.patch b/pkgs/tools/security/apg/phony-install-target.patch new file mode 100644 index 00000000000..9edf50b4b59 --- /dev/null +++ b/pkgs/tools/security/apg/phony-install-target.patch @@ -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}; \ |