nixpkgs/pkgs/tools/networking/ppp/nix-purity.patch

34 lines
991 B
Diff
Raw Normal View History

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
2021-07-20 19:21:36 +00:00
index 22837c5..6f6fff5 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
2021-07-20 19:21:36 +00:00
@@ -111,8 +111,8 @@ endif
# EAP SRP-SHA1
ifdef USE_SRP
-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
-LIBS += -lsrp -L/usr/local/ssl/lib
+CFLAGS += -DUSE_SRP -DOPENSSL -I@openssl_dev@/include/openssl
+LIBS += -lsrp -L@openssl_out@/lib
NEEDCRYPTOLIB = y
TARGETS += srp-entry
EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
@@ -143,7 +143,7 @@ CFLAGS += -DHAS_SHADOW
#LIBS += -lshadow $(LIBS)
endif
2021-07-20 19:21:36 +00:00
-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
+ifneq ($(wildcard @glibc@/include/crypt.h),)
CFLAGS += -DHAVE_CRYPT_H=1
2021-07-20 19:21:36 +00:00
LIBS += -lcrypt
endif
2021-07-20 19:21:36 +00:00
@@ -155,7 +155,7 @@ endif
2020-01-08 08:03:22 +00:00
ifdef NEEDDES
ifndef USE_CRYPT
2020-03-06 22:33:06 +00:00
-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
2021-07-20 19:21:36 +00:00
+CFLAGS += -I@openssl_dev@/include/openssl
NEEDCRYPTOLIB = y
2020-01-08 08:03:22 +00:00
else
CFLAGS += -DUSE_CRYPT=1