colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: flatpak: fix via nixpkgs patch instead of overlay

Browse Source
This commit is contained in:
Colin
2024-08-13 06:04:43 +00:00
parent 467283989f
commit 7a047702d5
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
overlays/cross.nix
View File

@@ -339,29 +339,29 @@ in with final; {
''; '';
}); });
# 2024/08/12: upstreaming is unblocked # 2024/08/12: upstreaming is unblocked, implemented on `pr-flatpak-cross`
flatpak = prev.flatpak.overrideAttrs (upstream: { # flatpak = prev.flatpak.overrideAttrs (upstream: {
# fixes "No package 'libxml-2.0' found" # # fixes "No package 'libxml-2.0' found"
buildInputs = upstream.buildInputs ++ [ libxml2 ]; # buildInputs = upstream.buildInputs ++ [ libxml2 ];
configureFlags = upstream.configureFlags ++ [ # configureFlags = upstream.configureFlags ++ [
"--enable-selinux-module=no" # fixes "checking for /usr/share/selinux/devel/Makefile... configure: error: cannot check for file existence when cross compiling" # "--enable-selinux-module=no" # fixes "checking for /usr/share/selinux/devel/Makefile... configure: error: cannot check for file existence when cross compiling"
"--disable-gtk-doc" # fixes "You must have gtk-doc >= 1.20 installed to build documentation for Flatpak" # "--disable-gtk-doc" # fixes "You must have gtk-doc >= 1.20 installed to build documentation for Flatpak"
]; # ];
postPatch = let # postPatch = let
# copied from nixpkgs flatpak and modified to use buildPackages python # # copied from nixpkgs flatpak and modified to use buildPackages python
vsc-py = buildPackages.python3.withPackages (pp: [ # vsc-py = buildPackages.python3.withPackages (pp: [
pp.pyparsing # pp.pyparsing
]); # ]);
in '' # in ''
patchShebangs buildutil # patchShebangs buildutil
patchShebangs tests # patchShebangs tests
PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler # PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler
'' + '' # '' + ''
sed -i s:'\$BWRAP --version:${stdenv.hostPlatform.emulator buildPackages} \$BWRAP --version:' configure.ac # sed -i s:'\$BWRAP --version:${stdenv.hostPlatform.emulator buildPackages} \$BWRAP --version:' configure.ac
sed -i s:'\$DBUS_PROXY --version:${stdenv.hostPlatform.emulator buildPackages} \$DBUS_PROXY --version:' configure.ac # sed -i s:'\$DBUS_PROXY --version:${stdenv.hostPlatform.emulator buildPackages} \$DBUS_PROXY --version:' configure.ac
''; # '';
}); # });
# 2024/08/12: upstreaming is blocked by xdg-desktop-portal # 2024/08/12: upstreaming is blocked by xdg-desktop-portal
fractal = prev.fractal.overrideAttrs (upstream: { fractal = prev.fractal.overrideAttrs (upstream: {

5
pkgs/additional/nixpkgs/list.nix
View File

@@ -39,6 +39,11 @@ in
hash = "sha256-9UrJB/ijXL07H/SESquCCqI1boVoYpDcYqxD+Mx2Mwc="; hash = "sha256-9UrJB/ijXL07H/SESquCCqI1boVoYpDcYqxD+Mx2Mwc=";
}) })
(fetchpatch' {
title = "flatpak: support cross compilation";
saneCommit = "pr-flatpak-cross";
})
(fetchpatch' { (fetchpatch' {
title = "syshud: 0-unstable-2024-07-29 -> 0-unstable-2024-08-10"; title = "syshud: 0-unstable-2024-07-29 -> 0-unstable-2024-08-10";
prUrl = "https://github.com/NixOS/nixpkgs/pull/333975"; prUrl = "https://github.com/NixOS/nixpkgs/pull/333975";