libqmi: fix cross via upstream patch
This commit is contained in:
@@ -470,14 +470,6 @@ in with final; {
|
|||||||
|
|
||||||
lemoa = prev.lemoa.override { cargo = crossCargo; };
|
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: {
|
# libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
|
||||||
# phonon = super.phonon.overrideAttrs (orig: {
|
# phonon = super.phonon.overrideAttrs (orig: {
|
||||||
# # fixes "ECM (required version >= 5.60), Extra CMake Modules"
|
# # fixes "ECM (required version >= 5.60), Extra CMake Modules"
|
||||||
|
@@ -40,6 +40,13 @@ in
|
|||||||
hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
|
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' {
|
(fetchpatch' {
|
||||||
# 2025-03-07: merged into staging
|
# 2025-03-07: merged into staging
|
||||||
name = "librsvg: generate loaders.cache even when cross compiling";
|
name = "librsvg: generate loaders.cache even when cross compiling";
|
||||||
|
Reference in New Issue
Block a user