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

cross: push xdg-desktop-portal build fix upstream

Browse Source
This commit is contained in:
Colin
2024-09-17 23:35:38 +00:00
parent b1036896fe
commit e2cd92a356
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
overlays/cross.nix
View File

@@ -1168,18 +1168,18 @@ in with final; {
# - i think the build script tries to run the generated binary? # - i think the build script tries to run the generated binary?
# vpnc = mvToNativeInputs [ perl ] prev.vpnc; # vpnc = mvToNativeInputs [ perl ] prev.vpnc;
# 2024/09/01: upstreaming is unblocked # 2024/09/17: upstreaming is unblocked, out for review: <https://github.com/NixOS/nixpkgs/pull/342669>
xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (upstream: { # xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [ # nativeBuildInputs = upstream.nativeBuildInputs ++ [
# fixes "meson.build:117:8: ERROR: Program 'bwrap' not found or not executable" # # fixes "meson.build:117:8: ERROR: Program 'bwrap' not found or not executable"
bubblewrap # bubblewrap
]; # ++ upstream.nativeCheckInputs; # ]; # ++ upstream.nativeCheckInputs;
mesonFlags = (upstream.mesonFlags or []) ++ [ # mesonFlags = (upstream.mesonFlags or []) ++ [
# fixes "tests/meson.build:268:9: ERROR: Program 'pytest-3 pytest' not found or not executable" # # fixes "tests/meson.build:268:9: ERROR: Program 'pytest-3 pytest' not found or not executable"
# nixpkgs should add this whenever doCheck == false, i think # # nixpkgs should add this whenever doCheck == false, i think
"-Dpytest=disabled" # "-Dpytest=disabled"
]; # ];
}); # });
# fixes: "data/meson.build:33:5: ERROR: Program 'msgfmt' not found or not executable" # fixes: "data/meson.build:33:5: ERROR: Program 'msgfmt' not found or not executable"
# fixes: "src/meson.build:25:0: ERROR: Program 'gdbus-codegen' not found or not executable" # fixes: "src/meson.build:25:0: ERROR: Program 'gdbus-codegen' not found or not executable"

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

@@ -53,6 +53,13 @@ in
hash = "sha256-WkTl1kK5ohO6+Bud8BNbFhjLlYMFapApHhVPsFrFKYc="; hash = "sha256-WkTl1kK5ohO6+Bud8BNbFhjLlYMFapApHhVPsFrFKYc=";
}) })
(fetchpatch' {
title = "xdg-desktop-portal: support cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/342669";
saneCommit = "0063648cdf6c3567b0435d9e288f9676f2b14039";
hash = "sha256-z+srs3vXBkU92bRuSaHBpb5e3FTj2Hq6jxgmP45t+to=";
})
(fetchpatch' { (fetchpatch' {
title = "wike: fix cross compilation"; title = "wike: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/338807"; prUrl = "https://github.com/NixOS/nixpkgs/pull/338807";