Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-02-13 12:33:29 +01:00
197 changed files with 4356 additions and 3415 deletions
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
separateDebugInfo = stdenv.isLinux;
preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
'';
patches = [ (fetchpatch {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
separateDebugInfo = stdenv.isLinux;
preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
'';
patches =