diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-24 09:19:43 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-24 09:19:43 +0200 |
commit | 7db611f2af869bac6e31ba814a5593c52d54ec19 (patch) | |
tree | ccb2231a8e0500eaeac92ac9f7a4a7f0c674ea43 /pkgs/os-specific | |
parent | 8987547106fcc1868cbc05fb295e0631d8edf138 (diff) | |
parent | e78fd235649e52180198f9f65ca9f172f8fe8161 (diff) | |
download | nixlib-7db611f2af869bac6e31ba814a5593c52d54ec19.tar nixlib-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.gz nixlib-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.bz2 nixlib-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.lz nixlib-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.xz nixlib-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.zst nixlib-7db611f2af869bac6e31ba814a5593c52d54ec19.zip |
Merge branch 'staging'
Includes libX11 security update.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index d8197edc46c5..f1abf0fbe925 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0vmynikcamfhakvwyk5dsffy0ymgi5mdqiwybdvqfn1ijaq93abg"; + sha256 = "0ida5njr9nacg6ym3rjvl3cc9czw0hn4akhzbqf8f4zmjl6cgrm9"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 80721c4b401d..33aa22abaf22 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -98,6 +98,7 @@ let sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' + sed -i scripts/ld-version.sh -e "s|/usr/bin/awk|${buildPackages.gawk}/bin/awk|" ''; configurePhase = '' @@ -145,9 +146,12 @@ let ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; # Some image types need special install targets (e.g. uImage is installed with make uinstall) - installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else - if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" else - "install") ]; + installTargets = [ ( + if platform ? kernelInstallTarget then platform.kernelInstallTarget + else if platform.kernelTarget == "uImage" then "uinstall" + else if platform.kernelTarget == "zImage" || platform.kernelTarget == "Image.gz" then "zinstall" + else "install" + ) ]; postInstall = (optionalString installsFirmware '' mkdir -p $out/lib/firmware diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index d6936ccd650e..e586539db08d 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, hostPlatform , linuxHeaders ? null , useBSDCompatHeaders ? true }: @@ -61,11 +61,12 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--syslibdir=$out/lib") ''; + CFLAGS="-fstack-protector-strong" + lib.optionalString hostPlatform.isPower " -mlong-double-64"; + configureFlags = [ "--enable-shared" "--enable-static" "--enable-debug" - "CFLAGS=-fstack-protector-strong" "--enable-wrapper=all" ]; |