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

libqmi: fix cross via upstream patch

Browse Source
This commit is contained in:
Colin
2025-03-09 23:01:59 +00:00
parent 072a98dce4
commit 73ddbe22f0
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overlays/cross.nix
View File

@@ -470,14 +470,6 @@ in with final; {
lemoa = prev.lemoa.override { cargo = crossCargo; };
libqmi = prev.libqmi.overrideAttrs (upstream: {
# gtk-doc fails (even with mesonEmulatorHook present)
outputs = lib.remove "devdoc" upstream.outputs;
mesonFlags = (lib.remove "-Dgtk_doc=true" upstream.mesonFlags) ++ [
"-Dgtk_doc=false"
];
});
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
# phonon = super.phonon.overrideAttrs (orig: {
# # fixes "ECM (required version >= 5.60), Extra CMake Modules"

7
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -40,6 +40,13 @@ in
hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
})
(fetchpatch' {
# 2025-03-07: testing before merge
name = "libqmi: unbreak cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/388297";
hash = "sha256-iW6b3yNWzWq2CrbtVVFvkhPdNwmRCjUTqLMq4mEHAV4=";
})
(fetchpatch' {
# 2025-03-07: merged into staging
name = "librsvg: generate loaders.cache even when cross compiling";