mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-08-26 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix: update nixpkgs-unstable

Browse Source 
Update nixpkgs-unstable to pick up fontconfig 2.18. Currently we are linking against 2.17 and you get errors
like this on standard error when using config files meant for fontconfig 2.18:

  Fontconfig warning: "/etc/fonts/conf.d/48-guessfamily.conf", line 20: invalid constant used :
  Fontconfig warning: "/etc/fonts/conf.d/48-guessfamily.conf", line 23: invalid constant used : monospace
  Fontconfig warning: "/etc/fonts/conf.d/48-guessfamily.conf", line 42: invalid attribute 'xsi:nil'
  Fontconfig warning: "/etc/fonts/conf.d/48-guessfamily.conf", line 43: invalid constant used :
  Fontconfig warning: "/etc/fonts/conf.d/48-guessfamily.conf", line 46: invalid constant used : sans-serif
  Fontconfig warning: "/etc/fonts/conf.d/48-guessfamily.conf", line 68: invalid attribute 'xsi:nil'
  Fontconfig warning: "/etc/fonts/conf.d/48-guessfamily.conf", line 69: invalid constant used :

This also removes an override for libfyaml on Darwin that was merged upstream into nixpkgs.
This commit is contained in:
Jeffrey C. Ollie
2026-08-06 14:31:12 -05:00
parent 8144ef4e73
commit 48a9e29f79
2 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock generated
View File

@@ -23,11 +23,11 @@
]
},
"locked": {
"lastModified": 1782657028,
"narHash": "sha256-PHTCpYZCMzJYS3phhywqRAZphKVr2zjvlGYa+H20ZZ4=",
"lastModified": 1787661347,
"narHash": "sha256-THmnBAdAIV+jT348f3r/vyoeb6ilhcVLwVXkBU7Pai8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4ad9aaae70c9aaab504127f926c0fa9cfbc2b365",
"rev": "52c3a5881c821ad7367bbde075e52b76cdb378ab",
"type": "github"
},
"original": {
@@ -38,15 +38,15 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1782545840,
"narHash": "sha256-CAi8oAZaE6pTkcYQBnnOlvmfMgG/p1AO0FohKKN3J7I=",
"rev": "3d46470bb3030020f7e1361f33514854f5bfa86d",
"lastModified": 1787424095,
"narHash": "sha256-SpMiSe9OSfWseGAupsdcED3He9mTYTbGMtWb7EVt6pE=",
"rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a",
"type": "tarball",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1023445.3d46470bb303/nixexprs.tar.xz"
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1059855.174eb786fb68/nixexprs.tar.zst"
},
"original": {
"type": "tarball",
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"
}
},
"root": {
@@ -88,11 +88,11 @@
]
},
"locked": {
"lastModified": 1782609341,
"narHash": "sha256-OfCPJFS/2Z2ZyjE4adR7PL+ZEqvDQFi2XNI1L8s6wKU=",
"lastModified": 1787617283,
"narHash": "sha256-jiM1glpDL5ASrqvcWyacI+c1wZo3g6AUhdo6M09AoiY=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "5386fea92c45b154bbeb52d14ef5504f82eda86c",
"rev": "da55b9fe9260fb3eb1456c3ee6064b8f738e4ba9",
"type": "github"
},
"original": {
@@ -108,11 +108,11 @@
]
},
"locked": {
"lastModified": 1784117571,
"lastModified": 1784080626,
"narHash": "sha256-Hvnmnuu0VpHiZl+8z+UkMoxC7JZJvRYBqu2Asb0ZJOE=",
"owner": "jcollie",
"repo": "zon2nix",
"rev": "0ce628fb78309cdb13d098ae9c6fdbf87c75d25b",
"rev": "776b5f6864a607c141d7966421b433fa1657ba9a",
"type": "github"
},
"original": {

30
flake.nix
View File

@@ -6,10 +6,10 @@
# glibc versions used by our dependencies from Nix are compatible with the
# system glibc that the user is building for.
#
# We are currently on nixpkgs-unstable to get Zig 0.15 for our package.nix and
# Gnome 49/Gtk 4.20.
# We are currently on nixpkgs-unstable to get Zig 0.16 for our package.nix,
# Gnome 50/Gtk 4.22, and fontconfig 2.18.
#
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst";
# Used for shell.nix
flake-compat = {
@@ -76,25 +76,7 @@
devShells = forAllPlatforms (pkgs: {
default =
pkgs.callPackage ./nix/devShell.nix
(let
libfyaml =
if pkgs.stdenv.hostPlatform.isDarwin
then
pkgs.libfyaml.overrideAttrs (prev: {
# Manually fix libfyaml.pc until NixOS/nixpkgs#515614 is available
postInstall =
(prev.postInstall or "")
+ ''
substituteInPlace "$dev/lib/pkgconfig/libfyaml.pc" \
--replace-fail " none required" ""
'';
})
else pkgs.libfyaml;
appstream = pkgs.appstream.override {libfyaml = libfyaml;};
libadwaita = pkgs.libadwaita.override {appstream = appstream;};
blueprint-compiler = pkgs.blueprint-compiler.override {libadwaita = libadwaita;};
in {
{
zig = zig.packages.${pkgs.stdenv.hostPlatform.system}."0.16.0";
wraptest = pkgs.callPackage ./nix/pkgs/wraptest.nix {};
zon2nix = zon2nix;
@@ -107,9 +89,7 @@
wcwidth = pyfinal.callPackage ./nix/pkgs/wcwidth.nix {};
};
};
inherit appstream libadwaita blueprint-compiler;
});
};
});
packages =