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

cross: push switchboard-plug-network patch upstream

Browse Source
This commit is contained in:
Colin
2024-09-17 21:35:18 +00:00
parent e4ab6e2022
commit b1036896fe
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
overlays/cross.nix
View File

@@ -882,14 +882,14 @@ in with final; {
# # buildInputs = lib.remove gnupg upstream.buildInputs;
# });
pantheon = prev.pantheon.overrideScope (self: super: {
# 2024/09/17: upstreaming is unblocked
switchboard-plug-network = super.switchboard-plug-network.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [
buildPackages.gettext #< for msgfmt
];
});
});
# pantheon = prev.pantheon.overrideScope (self: super: {
# # 2024/09/17: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/342648>
# switchboard-plug-network = super.switchboard-plug-network.overrideAttrs (upstream: {
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# buildPackages.gettext #< for msgfmt
# ];
# });
# });
# fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
# 2024/08/12: upstreaming is unblocked

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

@@ -46,6 +46,13 @@ in
hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
})
(fetchpatch' {
title = "pantheon.switchboard-plug-network: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/342648";
saneCommit = "902b9fff95ed3ebe0be04558477b21974d775f17";
hash = "sha256-WkTl1kK5ohO6+Bud8BNbFhjLlYMFapApHhVPsFrFKYc=";
})
(fetchpatch' {
title = "wike: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/338807";