diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-26 15:23:01 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-27 15:15:45 -0500 |
commit | 558c96fe13a692b5023d959933c89df4e0c49a34 (patch) | |
tree | 3067646df520d11bac31a5be78bdd0e52b0d3f59 /pkgs/applications | |
parent | 831c71eea34de2d947037d67e94b312de17b2bfc (diff) | |
download | nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.gz nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.bz2 nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.lz nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.xz nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.zst nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.zip |
treewide: Cleanup usage of multi-arch tools
- Don't needlessly force GCC - Prefer using multi-arch stdenvs to using multi-arch tools directly.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/airwave/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 4f010213b653..c37963c77f3e 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -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 |