From 8bfa9f528c88243578246798c7c2ddde045e0de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 13 Mar 2017 15:40:43 +0100 Subject: [PATCH] syslinux: fixup build via a Debian patch It stopped working probably since binutils update. --- pkgs/os-specific/linux/syslinux/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index f4ad94b5085..ce63d383c8e 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid, mtools, makeWrapper }: +{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: stdenv.mkDerivation rec { name = "syslinux-2015-11-09"; @@ -10,7 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; }; - patches = [ ./perl-deps.patch ]; + patches = [ + ./perl-deps.patch + (fetchurl { + # ldlinux.elf: Not enough room for program headers, try linking with -N + name = "not-enough-room.patch"; + url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/" + + "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7"; + sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; + }) + ]; nativeBuildInputs = [ nasm perl python ]; buildInputs = [ libuuid makeWrapper ];