mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 21:09:00 +02:00
Merge pull request #154085 from NickCao/roc-toolkit
roc-toolkit: fix cross compilation
This commit is contained in:
commit
57c4cd5bb1
|
@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
sconsFlags =
|
sconsFlags =
|
||||||
[ "--disable-sox"
|
[ "--build=${stdenv.buildPlatform.config}"
|
||||||
|
"--host=${stdenv.hostPlatform.config}"
|
||||||
|
"--prefix=${placeholder "out"}"
|
||||||
|
"--disable-sox"
|
||||||
"--disable-tests" ] ++
|
"--disable-tests" ] ++
|
||||||
lib.optional (!libunwindSupport) "--disable-libunwind" ++
|
lib.optional (!libunwindSupport) "--disable-libunwind" ++
|
||||||
lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++
|
lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++
|
||||||
|
@ -52,10 +55,6 @@ stdenv.mkDerivation rec {
|
||||||
prePatch = lib.optionalString stdenv.isAarch64
|
prePatch = lib.optionalString stdenv.isAarch64
|
||||||
"sed -i 's/c++98/c++11/g' SConstruct";
|
"sed -i 's/c++98/c++11/g' SConstruct";
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
sconsFlags+=" --prefix=$out"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Roc is a toolkit for real-time audio streaming over the network";
|
description = "Roc is a toolkit for real-time audio streaming over the network";
|
||||||
homepage = "https://github.com/roc-streaming/roc-toolkit";
|
homepage = "https://github.com/roc-streaming/roc-toolkit";
|
||||||
|
|
Loading…
Reference in a new issue