nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 03:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

flatpak: fix cross compilation, add cross check to passthru.tests

Browse Source 
The 1.14.8 -> 1.14.10 update broke cross compilation, because the upstream
build script now invokes runtime dependencies for feature detection.
<5a2503f1e8/configure.ac (L178)>

It seems the package will be more robust against changes if we simply
emulate these checks rather than attempt to patch them out individually.
This commit is contained in:
Colin 2024-08-19 23:29:30 +00:00 committed by Sandro Jäckel
parent 5c2a3cf6bb
commit 09a29769d5
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
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" { } ''