nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

atftp: fix build by using gcc49

Browse Source 
See #13559
This commit is contained in:
Pascal Wittmann 2016-03-21 21:46:14 +01:00
parent 92261129ea
commit 2bb151f91b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/networking/atftp/default.nix
View File

@ -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.isLinux;
assert stdenv.cc.isGNU; assert stdenv.cc.isGNU;
let let
@ -15,7 +15,7 @@ stdenv.mkDerivation {
url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q";
}; };
buildInputs = [ readline tcp_wrappers pcre makeWrapper ]; buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];
patches = [ debianPatch ]; patches = [ debianPatch ];
postInstall = '' postInstall = ''
wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}

4
pkgs/top-level/all-packages.nix
View File

@ -660,7 +660,9 @@ let
at = callPackage ../tools/system/at { }; at = callPackage ../tools/system/at { };
atftp = callPackage ../tools/networking/atftp {}; atftp = callPackage ../tools/networking/atftp {
gcc = gcc49;
};
autogen = callPackage ../development/tools/misc/autogen { }; autogen = callPackage ../development/tools/misc/autogen { };