diff options
| author | Will Dietz <w@wdtz.org> | 2017-10-19 15:57:19 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2017-10-19 15:57:19 -0500 |
| commit | 4eb090efc88aed4479f607e0293ca1494cc1672e (patch) | |
| tree | eee67e4e2114e16f2ea93fc382367b37ca1d4ec9 /pkgs/os-specific/linux/musl | |
| parent | acd80042a475f2b44dd2adc54e75f3f294ede1f1 (diff) | |
| download | nixlib-4eb090efc88aed4479f607e0293ca1494cc1672e.tar nixlib-4eb090efc88aed4479f607e0293ca1494cc1672e.tar.gz nixlib-4eb090efc88aed4479f607e0293ca1494cc1672e.tar.bz2 nixlib-4eb090efc88aed4479f607e0293ca1494cc1672e.tar.lz nixlib-4eb090efc88aed4479f607e0293ca1494cc1672e.tar.xz nixlib-4eb090efc88aed4479f607e0293ca1494cc1672e.tar.zst nixlib-4eb090efc88aed4479f607e0293ca1494cc1672e.zip | |
musl: 1.1.16 -> 1.1.17, build with stack protector
Diffstat (limited to 'pkgs/os-specific/linux/musl')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index e37a2b9f55e6..c51b8b26c809 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.16"; + version = "1.1.17"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck"; + sha256 = "0r0lyp2w6v2bvm8h1si7w3p2qx037szl14qnxm5p00568z3m3an8"; }; enableParallelBuilding = true; - # required to avoid busybox segfaulting on startup when invoking - # nix-build "<nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix>" + # Disable auto-adding stack protector flags, + # so musl can selectively disable as needed hardeningDisable = [ "stackprotector" ]; preConfigure = '' @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-static" + "CFLAGS=-fstack-protector-strong" ]; patches = []; |