diff options
| author | Yuka <yuka@yuka.dev> | 2022-09-15 20:38:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-15 20:38:48 +0200 |
| commit | 1315a28f885a82c3e84cf7e713fe5b6347bdd4c0 (patch) | |
| tree | 81b5d5e32ce6885bf6c549075fcadca20a423e90 /pkgs/os-specific/linux/musl/default.nix | |
| parent | a0e0d16dfc6c6b051f85206436ddf4bcb7a6eff2 (diff) | |
| download | nixpkgs-1315a28f885a82c3e84cf7e713fe5b6347bdd4c0.tar nixpkgs-1315a28f885a82c3e84cf7e713fe5b6347bdd4c0.tar.gz nixpkgs-1315a28f885a82c3e84cf7e713fe5b6347bdd4c0.tar.bz2 nixpkgs-1315a28f885a82c3e84cf7e713fe5b6347bdd4c0.tar.lz nixpkgs-1315a28f885a82c3e84cf7e713fe5b6347bdd4c0.tar.xz nixpkgs-1315a28f885a82c3e84cf7e713fe5b6347bdd4c0.tar.zst nixpkgs-1315a28f885a82c3e84cf7e713fe5b6347bdd4c0.zip | |
musl: apply patch for optional fields in fstab (#191033)
Diffstat (limited to 'pkgs/os-specific/linux/musl/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index b73c0ae04cd..bef1fa6e33a 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -67,6 +67,12 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) + + # fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream + (fetchurl { + url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6"; + sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0="; + }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; |