Skip to content

Commit 4d63d15

Browse files
committedMar 5, 2025
overlay: patch libqmi for broken cross builds
this provides the full analysis of the issue so carry this overlay fix until there is an upstream patch to resolve the issue. NixOS/nixpkgs#384946 Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
1 parent 16c1804 commit 4d63d15

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed
 

‎overlays/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,6 @@ The status of the integration in nixpkgs can be tracked using the [Pull Request
3939

4040
[gtklock: Multiple errors on wrong password](https://github.com/jovanlanik/gtklock/pull/119)
4141

42+
[libqmi: Failure to cross compile](https://github.com/NixOS/nixpkgs/issues/384946)
43+
4244
## carried in tiiuae/nixpkgs/...

‎overlays/cross-compilation/default.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
#
44
# This overlay is for specific fixes needed only to enable cross-compilation.
55
#
6-
(_final: _prev: { })
6+
(final: prev: {
7+
libqmi = import ./libqmi { inherit final prev; };
8+
})
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors
2+
# SPDX-License-Identifier: Apache-2.0
3+
#
4+
# papirus-icon-theme cross-compilation fixes (removing qt dependency)
5+
#
6+
# TODO: check if we should be using the qt6 version of the theme
7+
# kdePackages.breeze-icons and not the deprecated qt5 version
8+
{ final, prev }:
9+
prev.libqmi.override {
10+
meson = prev.buildPackages.meson.overrideAttrs {
11+
src = final.fetchFromGitHub {
12+
owner = "mesonbuild";
13+
repo = "meson";
14+
tag = "1.6.1";
15+
hash = "sha256-t0JItqEbf2YqZnu5mVsCO9YGzB7WlCfsIwi76nHJ/WI=";
16+
};
17+
};
18+
}

0 commit comments

Comments
 (0)
Failed to load comments.