treewide: Cleanup usage of multi-arch tools

- Don't needlessly force GCC

 - Prefer using multi-arch stdenvs to using multi-arch tools directly.
This commit is contained in:
John Ericson
2017-12-27 15:15:45 -05:00
parent 831c71eea3
commit 558c96fe13
3 changed files with 9 additions and 13 deletions
+3 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper
{ stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper
, overrideCC, qt5, requireFile, unzip, wine
}:
@@ -13,8 +13,6 @@ let
sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s";
};
stdenv_multi = overrideCC stdenv gcc_multi;
vst-sdk = stdenv.mkDerivation rec {
name = "vstsdk368_08_11_2017_build_121";
src = requireFile {
@@ -38,7 +36,7 @@ let
in
stdenv_multi.mkDerivation {
multiStdenv.mkDerivation {
name = "airwave-${version}";
src = airwave-src;
@@ -54,7 +52,7 @@ stdenv_multi.mkDerivation {
# For airwave-host-32.exe.so, point wineg++ to 32-bit versions of
# these libraries, as $NIX_LDFLAGS contains only 64-bit ones.
substituteInPlace src/host/CMakeLists.txt --replace '-m32' \
'-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${stdenv_multi.cc.libc.out}/lib/32'
'-m32 -L${wine-xembed}/lib -L${wine-xembed}/lib/wine -L${multiStdenv.cc.libc.out}/lib/32'
'';
# libstdc++.so link gets lost in 64-bit executables during