Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump: standard bump #1033

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+48 −23
Draft

bump: standard bump #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cf031d
bump: standard bump
brianmcgillion Feb 26, 2025
823d7aa
overlay: patch libqmi for broken cross builds
brianmcgillion Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions overlays/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ The status of the integration in nixpkgs can be tracked using the [Pull Request

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

[libqmi: Failure to cross compile](https://github.com/NixOS/nixpkgs/issues/384946)

## carried in tiiuae/nixpkgs/...
5 changes: 4 additions & 1 deletion overlays/cross-compilation/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
#
# This overlay is for specific fixes needed only to enable cross-compilation.
#
(_final: prev: { papirus-icon-theme = import ./papirus-icon-theme { inherit prev; }; })
(final: prev: {
papirus-icon-theme = import ./papirus-icon-theme { inherit prev; };
libqmi = import ./libqmi { inherit final prev; };
})
18 changes: 18 additions & 0 deletions overlays/cross-compilation/libqmi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors
# SPDX-License-Identifier: Apache-2.0
#
# papirus-icon-theme cross-compilation fixes (removing qt dependency)
#
# TODO: check if we should be using the qt6 version of the theme
# kdePackages.breeze-icons and not the deprecated qt5 version
{ final, prev }:
prev.libqmi.override {
meson = prev.buildPackages.meson.overrideAttrs {
src = final.fetchFromGitHub {
owner = "mesonbuild";
repo = "meson";
tag = "1.6.1";
hash = "sha256-t0JItqEbf2YqZnu5mVsCO9YGzB7WlCfsIwi76nHJ/WI=";
};
};
}
4 changes: 3 additions & 1 deletion overlays/cross-compilation/papirus-icon-theme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
#
# papirus-icon-theme cross-compilation fixes (removing qt dependency)
#
# TODO: check if we should be using the qt6 version of the theme
# kdePackages.breeze-icons and not the deprecated qt5 version
{ prev }:
prev.papirus-icon-theme.overrideAttrs (old: {
propagatedBuildInputs = prev.lib.lists.remove prev.breeze-icons old.propagatedBuildInputs;
propagatedBuildInputs = prev.lib.lists.remove prev.libsForQt5.breeze-icons old.propagatedBuildInputs;
})
Loading