From 2bb151f91b94bae61ec59a52faf66018a7287a26 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 21 Mar 2016 21:46:14 +0100 Subject: [PATCH] atftp: fix build by using gcc49 See #13559 --- pkgs/tools/networking/atftp/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index eda7f7168760..5fff72a3b075 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }: +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: assert stdenv.isLinux; assert stdenv.cc.isGNU; let @@ -15,7 +15,7 @@ stdenv.mkDerivation { url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; }; - buildInputs = [ readline tcp_wrappers pcre makeWrapper ]; + buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ]; patches = [ debianPatch ]; postInstall = '' wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34776a2b5353..c41bce9cc18f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -660,7 +660,9 @@ let at = callPackage ../tools/system/at { }; - atftp = callPackage ../tools/networking/atftp {}; + atftp = callPackage ../tools/networking/atftp { + gcc = gcc49; + }; autogen = callPackage ../development/tools/misc/autogen { };