Commit 5b74540c authored by John Ericson's avatar John Ericson
Browse files

treewide: Use `depsBuildBuild` for buildPackges.stdenv.cc

parent 3a50395e

pkgs/applications/networking/browsers/lynx/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec { 


  configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";



  nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig

    ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc

    ++ [ nukeReferences ];

  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ nukeReferences ]

    ++ stdenv.lib.optional sslSupport pkgconfig;



  buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;

pkgs/applications/video/mplayer/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ stdenv.mkDerivation rec { 
    rm -rf ffmpeg

  '';



  nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ];

  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ pkgconfig yasm ];

  buildInputs = with stdenv.lib;

    [ freetype ffmpeg ]

    ++ optional aalibSupport aalib

pkgs/development/compilers/gcc/5/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ stdenv.mkDerivation ({ 
  inherit noSysDirs staticCompiler langJava

    libcCross crossMingw;



  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ texinfo which gettext ]

    ++ (optional (perl != null) perl)

    ++ (optional javaAwtGtk pkgconfig);
@@ -287,7 +288,6 @@ stdenv.mkDerivation ({ 
    ++ (optionals langJava [ boehmgc zip unzip ])

    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

    ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])

    ++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc])

    ++ (optionals langAda [gnatboot])

    ++ (optionals langVhdl [gnat])

pkgs/development/libraries/glibc/common.nix

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ stdenv.mkDerivation ({ 


  outputs = [ "out" "bin" "dev" "static" ];



  nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc;

  depsBuildBuild = [ buildPackages.stdenv.cc ];

  buildInputs = lib.optionals withGd [ gd libpng ];



  # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to

pkgs/development/libraries/gmp/6.x.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ let self = stdenv.mkDerivation rec { 
  outputs = [ "out" "dev" "info" ];

  passthru.static = self.out;



  nativeBuildInputs = [ m4 ]

    ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc;

  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ m4 ];



  configureFlags =

    # Build a "fat binary", with routines for several sub-architectures