diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-20 14:17:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-20 14:46:19 +0200 |
| commit | b626e8383828c4888507c6cd47847569ced422e0 (patch) | |
| tree | 4d19211ee8e2c1f1721a3732add9c24d62e9eaa7 /pkgs/development/libraries/kerberos | |
| parent | 429fdbcd6314cbf7c8e4e47be50ef07986ac1c3c (diff) | |
| parent | 2a91dd0f65c44ef72cc7df6f51fbb56164fad728 (diff) | |
| download | nixpkgs-b626e8383828c4888507c6cd47847569ced422e0.tar nixpkgs-b626e8383828c4888507c6cd47847569ced422e0.tar.gz nixpkgs-b626e8383828c4888507c6cd47847569ced422e0.tar.bz2 nixpkgs-b626e8383828c4888507c6cd47847569ced422e0.tar.lz nixpkgs-b626e8383828c4888507c6cd47847569ced422e0.tar.xz nixpkgs-b626e8383828c4888507c6cd47847569ced422e0.tar.zst nixpkgs-b626e8383828c4888507c6cd47847569ced422e0.zip | |
Merge #16291: krb5: fix compilation on weird prefixes
(when nix store prefix contains a "+" character)
Diffstat (limited to 'pkgs/development/libraries/kerberos')
| -rw-r--r-- | pkgs/development/libraries/kerberos/krb5.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kerberos/path_char_fix.patch | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 332ca526b6b..78644200e0b 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ] ++ optionals (!libOnly) [ openldap libedit ]; + patches = [ ./path_char_fix.patch ]; + preConfigure = "cd ./src"; buildPhase = optionalString libOnly '' diff --git a/pkgs/development/libraries/kerberos/path_char_fix.patch b/pkgs/development/libraries/kerberos/path_char_fix.patch new file mode 100644 index 00000000000..2a6dc4c11c3 --- /dev/null +++ b/pkgs/development/libraries/kerberos/path_char_fix.patch @@ -0,0 +1,38 @@ +See https://github.com/krb5/krb5/pull/467 +diff --git a/src/include/Makefile.in b/src/include/Makefile.in +index 4bb11e4..cb4b44b 100644 +--- a/src/include/Makefile.in ++++ b/src/include/Makefile.in +@@ -57,19 +57,19 @@ SBINDIR = @sbindir@ + LIBDIR = @libdir@ + SYSCONFCONF = @SYSCONFCONF@ + +-PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ +- -e "s+@PREFIX+$(INSTALL_PREFIX)+" \ +- -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \ +- -e "s+@BINDIR+$(BINDIR)+" \ +- -e "s+@LIBDIR+$(LIBDIR)+" \ +- -e "s+@SBINDIR+$(SBINDIR)+" \ +- -e "s+@MODULEDIR+$(MODULE_DIR)+" \ +- -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \ +- -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ +- -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \ +- -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \ +- -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' \ +- -e 's+@SYSCONFCONF+$(SYSCONFCONF)+' ++PROCESS_REPLACE = -e "s\"@KRB5RCTMPDIR\"$(KRB5RCTMPDIR)\"" \ ++ -e "s\"@PREFIX\"$(INSTALL_PREFIX)\"" \ ++ -e "s\"@EXEC_PREFIX\"$(INSTALL_EXEC_PREFIX)\"" \ ++ -e "s\"@BINDIR\"$(BINDIR)\"" \ ++ -e "s\"@LIBDIR\"$(LIBDIR)\"" \ ++ -e "s\"@SBINDIR\"$(SBINDIR)\"" \ ++ -e "s\"@MODULEDIR\"$(MODULE_DIR)\"" \ ++ -e "s\"@GSSMODULEDIR\"$(GSS_MODULE_DIR)\"" \ ++ -e "s\"@LOCALSTATEDIR\"$(LOCALSTATEDIR)\"" \ ++ -e "s\"@RUNSTATEDIR\"$(RUNSTATEDIR)\"" \ ++ -e "s\"@SYSCONFDIR\"$(SYSCONFDIR)\"" \ ++ -e "s\"@DYNOBJEXT\"$(DYNOBJEXT)\"" \ ++ -e "s\"@SYSCONFCONF\"$(SYSCONFCONF)\"" + + OSCONFSRC = $(srcdir)/osconf.hin + |