summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-08-20 13:15:14 +0000
committerAlyssa Ross <hi@alyssa.is>2022-03-22 21:16:35 +0000
commitd45d95255f26b64e5db5ff42aa7c435bbcd80679 (patch)
tree683abd674fe9c52429538eaddfc80409bf1fa857
parent767ac6426c610bad5adabfcd162f0ed8999ed124 (diff)
downloadnixpkgs-d45d95255f26b64e5db5ff42aa7c435bbcd80679.tar
nixpkgs-d45d95255f26b64e5db5ff42aa7c435bbcd80679.tar.gz
nixpkgs-d45d95255f26b64e5db5ff42aa7c435bbcd80679.tar.bz2
nixpkgs-d45d95255f26b64e5db5ff42aa7c435bbcd80679.tar.lz
nixpkgs-d45d95255f26b64e5db5ff42aa7c435bbcd80679.tar.xz
nixpkgs-d45d95255f26b64e5db5ff42aa7c435bbcd80679.tar.zst
nixpkgs-d45d95255f26b64e5db5ff42aa7c435bbcd80679.zip
musl: mntent: fix parsing lines with optional fields
-rw-r--r--pkgs/os-specific/linux/musl/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index f19c7ea7a44..b7c0c9f514d 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch";
       sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
     })
+    (fetchurl {
+      url = "https://inbox.vuxu.org/musl/20210915221155.3977763-4-hi@alyssa.is/raw";
+      sha256 = "12bsvxqgym2drppmmymnr20xwkc4kn1bq7d3rysyayr92025hih8";
+    })
   ];
   CFLAGS = [ "-fstack-protector-strong" ]
     ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";