mirror of
https://github.com/ghostty-org/ghostty.git
synced 2025-08-02 14:57:31 +03:00
remove nixpkgs fork for zig 0.12
This commit is contained in:
17
flake.lock
generated
17
flake.lock
generated
@ -145,27 +145,10 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-zig-0-12": {
|
||||
"locked": {
|
||||
"lastModified": 1713479535,
|
||||
"narHash": "sha256-PnquFNhs0vtXwHkKk44dmnrNTMMCQelgi8pS/DGh6Ks=",
|
||||
"owner": "vancluever",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "153458bf17bfeedd3ab8b9a3250ba1168135e8ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "vancluever",
|
||||
"ref": "vancluever-zig-0-12",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nixpkgs-zig-0-12": "nixpkgs-zig-0-12",
|
||||
"zig": "zig",
|
||||
"zls": "zls"
|
||||
}
|
||||
|
12
flake.nix
12
flake.nix
@ -9,16 +9,6 @@
|
||||
# system glibc that the user is building for.
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/release-23.05";
|
||||
|
||||
# This is a nixpkgs mirror (based off of master) that contains
|
||||
# patches for Zig 0.12 (master/nightly).
|
||||
#
|
||||
# This gives an up-to-date Zig that contains the nixpkgs patches,
|
||||
# specifically the ones relating to NativeTargetInfo
|
||||
# (https://github.com/ziglang/zig/issues/15898) in addition to the base
|
||||
# hooks. This is used in the package (i.e. packages.ghostty, not the
|
||||
# devShell) to build a Zig that can be included in a NixOS configuration.
|
||||
nixpkgs-zig-0-12.url = "github:vancluever/nixpkgs/vancluever-zig-0-12";
|
||||
|
||||
zig = {
|
||||
url = "github:mitchellh/zig-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||
@ -34,7 +24,6 @@
|
||||
self,
|
||||
nixpkgs-unstable,
|
||||
nixpkgs-stable,
|
||||
nixpkgs-zig-0-12,
|
||||
zig,
|
||||
zls,
|
||||
...
|
||||
@ -42,7 +31,6 @@
|
||||
builtins.foldl' nixpkgs-stable.lib.recursiveUpdate {} (builtins.map (system: let
|
||||
pkgs-stable = nixpkgs-stable.legacyPackages.${system};
|
||||
pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
|
||||
pkgs-zig-0-12 = nixpkgs-zig-0-12.legacyPackages.${system};
|
||||
in {
|
||||
devShell.${system} = pkgs-stable.callPackage ./nix/devShell.nix {
|
||||
inherit (pkgs-unstable) tracy;
|
||||
|
Reference in New Issue
Block a user