From 891fd356d77522dcf1dfbd3e0e45f9b26ba1dcc3 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 21 Mar 2016 21:40:40 +0100 Subject: [PATCH] avarice: fix build by using gcc49 See #13559 --- pkgs/development/tools/misc/avarice/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index e2c4c89e998..eb81b7136f3 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, libusb }: +{ stdenv, fetchurl, pkgconfig, gcc, perl, libusb }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1"; }; - buildInputs = [ pkgconfig perl libusb ]; + buildInputs = [ pkgconfig gcc perl libusb ]; meta = { license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c41bce9cc18..f7cdd5dde47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5717,7 +5717,9 @@ let avrdude = callPackage ../development/tools/misc/avrdude { }; - avarice = callPackage ../development/tools/misc/avarice { }; + avarice = callPackage ../development/tools/misc/avarice { + gcc = gcc49; + }; babeltrace = callPackage ../development/tools/misc/babeltrace { };