From 01663c8b290e76d7727bcfb2e961d26dae63d395 Mon Sep 17 00:00:00 2001 From: Chris Marchesi Date: Tue, 21 Nov 2023 15:59:24 -0800 Subject: [PATCH] nix: update zigCacheHash, mention that building pkg requires src This updates the zigCacheHash and just adds a note mentioning that using the package will require you to rebuild LLVM 17 and Zig, and directs people to use the devShell until this is resolved. This is likely good advice for most people until such time that both are in nixpkgs (or at least LLVM 17 as it's by far the bigger culprit here). --- flake.nix | 9 +++++++++ nix/package.nix | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 64033b6cb..28f8fd273 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,15 @@ let pkgs = import nixpkgs { inherit overlays system; }; in rec { devShell = pkgs.devShell; + + # NOTE: using packages.ghostty right out of the flake currently + # requires a build of LLVM 17 and Zig master from source. This will + # take quite a bit of time. Until LLVM 17 and an upcoming Zig 0.12 are + # up in nixpkgs, most folks will want to continue to use the devShell + # and the instructions found at: + # + # https://github.com/mitchellh/ghostty/tree/main#developing-ghostty + # packages.ghostty = pkgs.ghostty; defaultPackage = packages.ghostty; } diff --git a/nix/package.nix b/nix/package.nix index 2f479a063..8037668e8 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,3 +1,10 @@ +# NOTE: using this derivation right out of the flake currently requires a build +# of LLVM 17 and Zig master from source. This will take quite a bit of time. +# Until LLVM 17 and an upcoming Zig 0.12 are up in nixpkgs, most folks will +# want to continue to use the devShell and the instructions found at: +# +# https://github.com/mitchellh/ghostty/tree/main#developing-ghostty +# { lib , stdenv @@ -50,7 +57,7 @@ let # (It's also possible that you might see a hash mismatch - without the # network errors - if you don't have a previous instance of the cache # derivation in your store already. If so, just update the value as above.) - zigCacheHash = "sha256-nfvrGL7CMb8sr9gFhU5GVkN5H+hIxNzMPr2760rV2BM="; + zigCacheHash = "sha256-/6XhZq5NYWbHhg0yQ9iT/6oGewsurIpeGNJyNT+E6CQ="; zigCache = src: stdenv.mkDerivation { inherit src;