Unverified Commit 09a29769 authored by Colin's avatar Colin Committed by Sandro Jäckel
Browse files

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

The 1.14.8 -> 1.14.10 update broke cross compilation, because the upstream
build script now invokes runtime dependencies for feature detection.
<https://github.com/flatpak/flatpak/blob/5a2503f1e8ef94364e3060ec440546cc47af7fa5/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.
parent 5c2a3cf6

pkgs/by-name/fl/flatpak/package.nix

+10 −2
Original line number Diff line number Diff line
@@ -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" { } ''