From b1036896fe36f2931b8f87ecfae9d236a7d2d967 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 17 Sep 2024 21:35:18 +0000 Subject: [PATCH] cross: push switchboard-plug-network patch upstream --- overlays/cross.nix | 16 ++++++++-------- pkgs/additional/nixpkgs/list.nix | 7 +++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 36215e74b..638150de6 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -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: + # 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 diff --git a/pkgs/additional/nixpkgs/list.nix b/pkgs/additional/nixpkgs/list.nix index 25b84f377..9fdb263d5 100644 --- a/pkgs/additional/nixpkgs/list.nix +++ b/pkgs/additional/nixpkgs/list.nix @@ -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";