From c13ddd14bda4905bb9eebff5ab30c10516869baf Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 26 Mar 2016 16:47:46 +0100 Subject: [PATCH] udftools: fix gcc5 build -fgnu89-inline was insufficient, revert to -std=gnu90 See https://hydra.nixos.org/build/33103604/nixlog/1/raw Also fix various undefined reference errors by ad-hoc patching --- pkgs/tools/filesystems/udftools/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 329950f8969..7cb924c6cf1 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -10,9 +10,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; + NIX_CFLAGS_COMPILE = "-std=gnu90"; + preConfigure = '' sed -e '1i#include ' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c + sed -e '27i#include ' -i include/udf_endian.h + sed -e '38i#include ' -i wrudf/wrudf-cdrw.c + sed -e '12i#include ' -i wrudf/wrudf-cdr.c + sed -e '37i#include ' -i wrudf/ide-pc.c ''; meta = with stdenv.lib; {