From 2c1e736ae8ea308cecc6b6f2cf44638280393363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Aug 2018 10:36:52 +0200 Subject: [PATCH] gnome3.libgda: build with gcc6 on aarch64 Fixes #45618. I don't know what's the matter. Feel free to come with a better fix. --- pkgs/desktops/gnome-3/misc/libgda/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index a10675ab8033..069c769efaa2 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +, overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null }: @@ -6,7 +7,7 @@ assert mysqlSupport -> mysql != null; assert postgresSupport -> postgresql != null; -stdenv.mkDerivation rec { +(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { name = "libgda-${version}"; version = "5.2.4";