summary refs log tree commit diff
path: root/pkgs/os-specific/linux/musl/default.nix
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-09-18 17:11:12 -0500
committerWill Dietz <w@wdtz.org>2018-09-18 17:13:54 -0500
commit4305e7d5ecee69b82101c0cb273fddf23aa5c6e2 (patch)
treed937e1b270cf1753ee6ca00f7b719f8057dcb354 /pkgs/os-specific/linux/musl/default.nix
parentea326dd4b52a57f812c72cba3d3d21dd9a343a85 (diff)
downloadnixlib-4305e7d5ecee69b82101c0cb273fddf23aa5c6e2.tar
nixlib-4305e7d5ecee69b82101c0cb273fddf23aa5c6e2.tar.gz
nixlib-4305e7d5ecee69b82101c0cb273fddf23aa5c6e2.tar.bz2
nixlib-4305e7d5ecee69b82101c0cb273fddf23aa5c6e2.tar.lz
nixlib-4305e7d5ecee69b82101c0cb273fddf23aa5c6e2.tar.xz
nixlib-4305e7d5ecee69b82101c0cb273fddf23aa5c6e2.tar.zst
nixlib-4305e7d5ecee69b82101c0cb273fddf23aa5c6e2.zip
musl: apply upstream fix for file locking race
Diffstat (limited to 'pkgs/os-specific/linux/musl/default.nix')
-rw-r--r--pkgs/os-specific/linux/musl/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index f88e1850bad5..ccabe97969a6 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
       url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch;
       sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
     })
+    # Upstream bugfix, see: https://git.musl-libc.org/cgit/musl/commit/?id=0db393d3a77bb9f300a356c6a5484fc2dddb161d
+    # Explicitly flagged for inclusion by distributions using musl
+    ./fix-file-locking-race.patch
   ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")