From 70d91badf57bbe4cd884e5da22b14662dd36009c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 10 Oct 2017 19:01:42 -0400 Subject: [PATCH] treewide: Depend on stdenv.cc.bintools instead of binutils directly One should do this when needed executables at build time. It is more honest and cross-friendly than refering to binutils directly. --- pkgs/applications/editors/jucipp/default.nix | 4 ++-- pkgs/build-support/cc-wrapper/default.nix | 5 +++++ pkgs/development/tools/profiling/systemtap/default.nix | 6 ++++-- pkgs/games/brogue/default.nix | 2 +- pkgs/games/steam/runtime.nix | 4 ++-- pkgs/servers/asterisk/default.nix | 4 ++-- pkgs/tools/networking/htpdate/default.nix | 2 +- pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 4 ++-- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index ae4f1e6ad52..3d623d3f3bd 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, - coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }: + coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: with stdenv.lib; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/juci $out/bin/.juci makeWrapper "$out/bin/.juci" "$out/bin/juci" \ - --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \ + --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \ --set NO_AT_BRIDGE 1 \ --set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell" ''; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 489fb02dcb5..6de2693a8b1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -97,6 +97,11 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; passthru = { + # "cc" is the generic name for a C compiler, but there is no one for package + # providing the linker and related tools. The two we use now are GNU + # Binutils, and Apple's "cctools"; "binutils" as an attempt to find an + # unused middle-ground name that evokes both. + bintools = binutils_bin; inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile prefix; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 89a1b5fe0aa..b397f02665b 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,5 +1,7 @@ { fetchgit, pkgconfig, gettext, runCommand, makeWrapper -, elfutils, kernel, gnumake, python2, pythonPackages, binutils }: +, elfutils, kernel, gnumake, python2, pythonPackages +}: + let ## fetchgit info url = git://sourceware.org/git/systemtap.git; @@ -55,5 +57,5 @@ in runCommand "systemtap-${kernel.version}-${version}" { rm $out/bin/stap makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "-r $kernelBuildDir" \ - --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc binutils elfutils gnumake ]} + --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]} '' diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 814f4f6c82e..d48dc8e8006 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, ncurses, libtcod, binutils }: +{ stdenv, fetchurl, SDL, ncurses, libtcod }: stdenv.mkDerivation rec { name = "brogue-${version}"; diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 82fce93a66a..1fa17c32d6c 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -1,4 +1,4 @@ -{ stdenv, steamArch, fetchurl, writeText, python2, dpkg, binutils }: +{ stdenv, steamArch, fetchurl, writeText, python2, dpkg }: let input = builtins.getAttr steamArch (import ./runtime-generated.nix { inherit fetchurl; }); @@ -7,7 +7,7 @@ let input = builtins.getAttr steamArch (import ./runtime-generated.nix { inherit in stdenv.mkDerivation { name = "steam-runtime-2016-08-13"; - nativeBuildInputs = [ python2 dpkg binutils ]; + nativeBuildInputs = [ python2 dpkg stdenv.cc.bintools ]; buildCommand = '' mkdir -p $out diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 1bea8006e9f..c6cd9f3df4c 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch, jansson, libxml2, libxslt, ncurses, openssl, sqlite, - utillinux, dmidecode, libuuid, binutils, newt, + utillinux, dmidecode, libuuid, newt, lua, speex, srtp, wget, curl }: @@ -10,7 +10,7 @@ let inherit version; name = "asterisk-${version}"; - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl ]; + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl ]; patches = [ # We want the Makefile to install the default /var skeleton diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index d937f3c2f0b..47163b94dc5 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL=install" - "STRIP=strip" + "STRIP=${stdenv.cc.bintools.prefix}strip" "prefix=$(out)" ]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 901d84b4692..f63c1d474c0 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "1zvadgsskmpm82id9mbj24a2lyq38qv768ixv7nmfjl3d4wr2biv"; }; - nativeBuildInputs = [ bison binutils gettext pkgconfig ]; - buildInputs = [ glib gnutls gtk2 libxml2 zlib ]; + nativeBuildInputs = [ bison gettext pkgconfig ]; + buildInputs = [ binutils glib gnutls gtk2 libxml2 zlib ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];