Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 880311a5258e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0edb8f7b4082
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 11, 2018

  1. glibc: patch to fix building w/musl-based stdenv 

    See:
https://sourceware.org/bugzilla/show_bug.cgi?id=21604
    @dtzWill
    dtzWill committed Mar 11, 2018
    Copy the full SHA
    82644c1 View commit details

  2. glibc: make fetchpatch optional ("? null"), just in case.

    @dtzWill
    dtzWill committed Mar 11, 2018
    Copy the full SHA
    54c4c18 View commit details

  3. Merge pull request #36810 from dtzWill/fix/glibc-with-musl 

    glibc: patch to fix building w/musl-based stdenv
    @dtzWill
    dtzWill authored Mar 11, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0edb8f7 View commit details
Showing with 16 additions and 4 deletions.
  1. +8 −2 pkgs/development/libraries/glibc/common-2.27.nix
  2. +8 −2 pkgs/development/libraries/glibc/common.nix
10 changes: 8 additions & 2 deletions pkgs/development/libraries/glibc/common-2.27.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
{ stdenv, lib
, buildPlatform, hostPlatform
, buildPackages
, fetchurl
, fetchurl, fetchpatch ? null
, linuxHeaders ? null
, gd ? null, libpng ? null
, bison
@@ -78,7 +78,13 @@ stdenv.mkDerivation ({
*/
./allow-kernel-2.6.32.patch
]
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.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";
});

postPatch =
''
10 changes: 8 additions & 2 deletions pkgs/development/libraries/glibc/common.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
{ stdenv, lib
, buildPlatform, hostPlatform
, buildPackages
, fetchurl
, fetchurl, fetchpatch ? null
, linuxHeaders ? null
, gd ? null, libpng ? null
}:
@@ -88,7 +88,13 @@ stdenv.mkDerivation ({
*/
./allow-kernel-2.6.32.patch
]
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.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";
});

postPatch =
# Needed for glibc to build with the gnumake 3.82