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

nixpkgs: intra-day update (to get my upstreamed fontconfig fixes)

Browse Source
This commit is contained in:
Colin
2025-03-20 14:51:43 +00:00
parent 6c9766c96b
commit 73d79e10e7
3 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/common/programs/fontconfig.nix
View File

@@ -35,7 +35,6 @@ in
fonts = lib.mkIf config.sane.programs.fontconfig.enabled {
fontconfig.enable = true;
fontconfig.cache32Bit = true; #< TODO: remove (here for testing)
fontconfig.defaultFonts = {
emoji = [
"Noto Color Emoji"

4
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {},
}:
mkNixpkgs {
rev = "a5104e8439375b3b49cfac468894f40a81bf5673";
sha256 = "sha256-NIuAPnsyRbVl7S73/azhfEX9MOtBWtDFuknr8iplbMY=";
rev = "7344a3b78128f7b1765dba89060b015fb75431a7";
sha256 = "sha256-yvdnTnROddjHxoQqrakUQWDZSzVchczfsuuMOxg476c=";
version = "0-unstable-2025-03-20";
branch = "master";
}

32
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -40,31 +40,6 @@ in
hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
})
# TODO: remove `fontconfig.cache32Bit = true` from fontconfig.nix after merge (and maybe after seeing if it's beneficial for signal/electron apps?)
(fetchpatch' {
name = "nixos/fonts: ship fontconfig caches even for cross-compiled hosts";
prUrl = "https://github.com/NixOS/nixpkgs/pull/391305";
hash = "sha256-HsvNoMFQXrCKsDBtWv6NCkIDBea4FGNQWTVJwwu1RgI=";
})
# (fetchpatch' {
# name = "makeFontsCache: fix cross compilation";
# saneCommit = "e021ee13f909e6eb7c019b5cd1acf9eac0cd0f67";
# hash = "sha256-3fJtcYfIDIIcn2p9LunPmRX1DWlcQ33OAw3Ok3sUs8g=";
# })
# (fetchpatch' {
# name = "nixos/fonts: ship fontconfig caches even for cross-compiled hosts";
# saneCommit = "9435a2b422f090b25f4aa5aee53be1341626672d";
# hash = "sha256-4bhzdWxQ650+4bq4+2K4vJb/iQSPtppp3tBrs+qGdNQ=";
# })
(fetchpatch' {
# 2025-03-18: merged into master
name = "nvimpager: enable strictDeps & cleanup inputs";
prUrl = "https://github.com/NixOS/nixpkgs/pull/390878";
# saneCommit = "e55b9041bc27a89549995a8d5f4f458f770ae8fd";
hash = "sha256-Fi+seOOkErufBatEzSVcLM8Fj8ZUcvHNIbkpf+RIFLo=";
})
(fetchpatch' {
# 2025-03-14: merged into staging-next
name = "[staging-next] pipewire: fix cross compilation";
@@ -82,13 +57,6 @@ in
hash = "sha256-Uo3MUP6lJk0i61pJFj2wNKRphpzNZHU96USq1F6Sdlo=";
})
(fetchpatch' {
# 2025-03-17: merged into staging-next
name = "glycin-loaders: enable strictDeps";
prUrl = "https://github.com/NixOS/nixpkgs/pull/390882";
hash = "sha256-NKhbKA9JTO1Pzoz1U89OWJO2kVtGwJRr3Lm+CQZVdnE=";
})
(fetchpatch' {
# 2025-03-17: merged into staging-next
name = "gtk4-layer-shell: fix cross compilation";