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

cross: remove a few upstreamed patches

Browse Source
This commit is contained in:
Colin
2024-09-17 21:08:49 +00:00
parent 631bd9998d
commit e4ab6e2022
2 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
overlays/cross.nix
View File

@@ -115,10 +115,6 @@ in with final; {
# });
# };
# 2024/09/01: upstreaming is unblocked; PR: https://github.com/NixOS/nixpkgs/pull/338790
# ayatana-ido = addNativeInputs [ glib ] prev.ayatana-ido;
# libayatana-indicator = addNativeInputs [ glib ] prev.libayatana-indicator;
# bamf: required via pantheon.switchboard -> wingpanel -> gala
# bamf = prev.bamf.overrideAttrs (upstream: {
# # "You must have gtk-doc >= 1.0 installed to build documentation"
@@ -887,27 +883,12 @@ in with final; {
# });
pantheon = prev.pantheon.overrideScope (self: super: {
# 2024/09/01: upstreaming is blocked on libayatana-indicator (out for review https://github.com/NixOS/nixpkgs/pull/338790)
# 2024/09/17: upstreaming is unblocked
switchboard-plug-network = super.switchboard-plug-network.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [
buildPackages.gettext # <for msgfmt
buildPackages.gettext #< for msgfmt
];
});
# 2024/09/01: upstreaming is unblocked; out for review: <https://github.com/NixOS/nixpkgs/pull/338799>
# switchboard-plug-sound = super.switchboard-plug-sound.overrideAttrs (upstream: {
# # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
# # pkg-config #< so that it can find the right gettext/msgfmt
# # ];
# # everything requires an extra `buildPackages` than if i patched this inside nixpkgs itself: not sure why!
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# buildPackages.gettext #< for msgfmt
# # gettext #< for msgfmt
# buildPackages.glib
# ];
# env.PKG_CONFIG_GIO_2_0_GLIB_COMPILE_RESOURCES = "${lib.getDev buildPackages.buildPackages.glib}/bin/glib-compile-resources";
# strictDeps = true;
# });
});
# fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"

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

@@ -52,18 +52,6 @@ in
hash = "sha256-qAoDQuv34gV1Etc/6Kj5U0c3HHsPAUR1Fshb456i5pA=";
})
(fetchpatch' {
title = "ayatana-ido,libayatana-indicator: move to pkgs/by-name and fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/338790";
hash = "sha256-BbnXCFs5zD2IQhzvlH1bexEExg/kMf+N+WnXwdCdxP0=";
})
(fetchpatch' {
title = "pantheon.switchboard-plug-sound: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/338799";
hash = "sha256-q/WhUH+NbeMALApCgSpQqe9eQ9jcod0EqEnTc19Qut4=";
})
# (fetchpatch' {
# # this causes a rebuild of systemd and everything above it:
# # PR against staging is live: <https://github.com/NixOS/nixpkgs/pull/332399>