mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 08:59:32 +03:00
Merge pull request #151295 from Mic92/cross-compile-fixes
{pipewire,replace}: fix cross compile
This commit is contained in:
commit
750e61beb5
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPackages
|
||||
, fetchFromGitLab
|
||||
, removeReferencesTo
|
||||
, python3
|
||||
@ -171,12 +172,17 @@ let
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/nix-support
|
||||
pushd $lib/share/pipewire
|
||||
for f in *.conf; do
|
||||
echo "Generating JSON from $f"
|
||||
$out/bin/spa-json-dump "$f" > "$out/nix-support/$f.json"
|
||||
done
|
||||
popd
|
||||
${if (stdenv.hostPlatform == stdenv.buildPlatform) then ''
|
||||
pushd $lib/share/pipewire
|
||||
for f in *.conf; do
|
||||
echo "Generating JSON from $f"
|
||||
|
||||
$out/bin/spa-json-dump "$f" > "$out/nix-support/$f.json"
|
||||
done
|
||||
popd
|
||||
'' else ''
|
||||
cp ${buildPackages.pipewire}/nix-support/*.json "$out/nix-support"
|
||||
''}
|
||||
|
||||
moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse"
|
||||
moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse"
|
||||
|
@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
makeFlags = [ "TREE=\$(out)" "MANTREE=\$(TREE)/share/man" ];
|
||||
makeFlags = [
|
||||
"TREE=\$(out)"
|
||||
"MANTREE=\$(TREE)/share/man"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h
|
||||
|
Loading…
Reference in New Issue
Block a user