diff options
| author | Will Dietz <w@wdtz.org> | 2018-04-24 19:58:44 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-04-24 19:58:44 -0500 |
| commit | f07f0c6009bb4c2653350fac8db2eee29e09bd1b (patch) | |
| tree | 6d5af636871d77e964ece378d93fbc914561aff2 /pkgs/development/libraries/glibc/common.nix | |
| parent | 4b2f3971981272b79da7f87b639ca8854a6ea89c (diff) | |
| parent | 7e33e374db487ed87db316db3b2687f917aa7f90 (diff) | |
| download | nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.gz nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.bz2 nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.lz nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.xz nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.zst nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development/libraries/glibc/common.nix')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index c8716bfdc796..31567f0049dd 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -95,12 +95,7 @@ stdenv.mkDerivation ({ ./allow-kernel-2.6.32.patch ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch - ++ lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - name = "fix-with-musl.patch"; - url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw"; - sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2"; - }); + ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch; postPatch = '' |