summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-07-17 22:38:45 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-09-15 12:14:12 -0700
commit3000e55b06243c3699e55c90bfc6ecfe409a5aae (patch)
tree840892b729bd45a699473b8181f0571121a2d413 /pkgs/top-level
parentf4a42ae509216463e774843ffabc75399532a717 (diff)
downloadnixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar
nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.gz
nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.bz2
nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.lz
nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.xz
nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.tar.zst
nixlib-3000e55b06243c3699e55c90bfc6ecfe409a5aae.zip
syslinux: Use gcc 4.8 until a proper fix for 5 is made
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a96d5c455c5..e924feaf78e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10048,7 +10048,13 @@ let
 
   sysklogd = callPackage ../os-specific/linux/sysklogd { };
 
-  syslinux = callPackage ../os-specific/linux/syslinux { };
+  syslinux = callPackage ../os-specific/linux/syslinux {
+    # Using GCC5 with 6.03 creates a broken isolinux.bin
+    # Make sure to test booting the livecd on a bios system
+    # if changing this override.
+    # nixos.tests.bootBiosCdrom is useful for this.
+    stdenv = overrideCC stdenv gcc48;
+  };
 
   sysstat = callPackage ../os-specific/linux/sysstat { };