From 4dccb224c584194e964b5fbef5fe2cee28c57803 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Tue, 26 Aug 2014 00:17:03 +0200
Subject: WIP2

---
 pkgs/development/compilers/gcc/4.8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/compilers/gcc/4.8/default.nix')

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 7197aa22b1d..e7f28bb4f07 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -216,7 +216,7 @@ stdenv.mkDerivation ({
 
   outputs = [ "out" "lib" ];
 
-  setOutputConfigureFlags = false;
+  setOutputFlags = false;
 
 
   libc_dev = stdenv.gcc.libc_dev;
@@ -372,7 +372,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if (stdenv ? glibc && cross == null)
-      then " --with-native-system-header-dir=${stdenv.glibc}/include"
+      then " --with-native-system-header-dir=${stdenv.glibc.dev}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
     ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-- 
cgit 1.4.1