dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

flatpak: fix cross compilation (#337412)

Browse Source
This commit is contained in:
Sandro 2024-08-26 13:30:51 +02:00 committed by GitHub
commit db4be47741
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/by-name/fl/flatpak/package.nix
View File

@ -7,6 +7,7 @@
autoreconfHook,
bison,
bubblewrap,
buildPackages,
bzip2,
coreutils,
curl,
@ -40,6 +41,7 @@
p11-kit,
pkg-config,
polkit,
pkgsCross,
python3,
shared-mime-info,
socat,
@ -205,8 +207,12 @@ stdenv.mkDerivation (finalAttrs: {
PATH=${lib.makeBinPath [ vsc-py ]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler
substituteInPlace configure.ac \
--replace-fail '$BWRAP --version' 'echo ${bubblewrap.version}' \
--replace-fail '$DBUS_PROXY --version' 'echo ${xdg-dbus-proxy.version}'
--replace-fail '$BWRAP --' ${
lib.escapeShellArg (stdenv.hostPlatform.emulator buildPackages + " $BWRAP --")
} \
--replace-fail '$DBUS_PROXY --' ${
lib.escapeShellArg (stdenv.hostPlatform.emulator buildPackages + " $DBUS_PROXY --")
}
'';
passthru = {
@ -218,6 +224,8 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = nix-update-script { };
tests = {
cross = pkgsCross.aarch64-multiplatform.flatpak;
installedTests = nixosTests.installed-tests.flatpak;
validate-icon = runCommand "test-icon-validation" { } ''