diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2017-08-31 21:22:15 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-08-31 21:23:01 +0100 |
| commit | 008dca20d413d75867ec3959cbc6525926c7b9b3 (patch) | |
| tree | 22e81bb8650cd3443f129b788e9c0e92065a07d1 /sys-apps/nix/files | |
| parent | profiles: drop mask dev-python/kaa-base[tls] (diff) | |
| download | gentoo-008dca20d413d75867ec3959cbc6525926c7b9b3.tar.gz gentoo-008dca20d413d75867ec3959cbc6525926c7b9b3.tar.bz2 gentoo-008dca20d413d75867ec3959cbc6525926c7b9b3.zip | |
sys-apps/nix: bump up to 1.11.14
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'sys-apps/nix/files')
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.14-etc-fixes.patch | 8 | ||||
| -rw-r--r-- | sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch b/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch new file mode 100644 index 000000000000..07962838a224 --- /dev/null +++ b/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch @@ -0,0 +1,8 @@ +diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in +index 4f09b55..e93ef42 100644 +--- a/scripts/nix-profile.sh.in ++++ b/scripts/nix-profile.sh.in +@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then + if ! [ -L "$NIX_LINK" ]; then +- echo "creating $NIX_LINK" >&2 + _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile diff --git a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch b/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch new file mode 100644 index 000000000000..44c995e3239e --- /dev/null +++ b/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch @@ -0,0 +1,16 @@ +'context' is no more after: +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9 + +'ucontext_t' is the new name. +diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc +index 41b617d..695aaad 100644 +--- a/src/libmain/stack.cc ++++ b/src/libmain/stack.cc +@@ -22,5 +22,5 @@ static void sigsegvHandler(int signo, siginfo_t * info, void * ctx) + #if defined(__x86_64__) && defined(REG_RSP) +- sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP]; ++ sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_RSP]; + #elif defined(REG_ESP) +- sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_ESP]; ++ sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_ESP]; + #else |