Merge pull request #1630 from RGBCube/releasefast-default

nix: make ReleaseFast the default package
This commit is contained in:
Mitchell Hashimoto
2024-03-29 13:44:54 -07:00
committed by GitHub
2 changed files with 11 additions and 21 deletions

View File

@ -52,23 +52,19 @@
wraptest = pkgs-stable.callPackage ./nix/wraptest.nix {}; wraptest = pkgs-stable.callPackage ./nix/wraptest.nix {};
}; };
packages.${system} = rec { packages.${system} = let
ghostty-debug = pkgs-stable.callPackage ./nix/package.nix { mkArgs = optimize: {
inherit (pkgs-zig-0-12) zig_0_12; inherit (pkgs-zig-0-12) zig_0_12;
inherit optimize;
revision = self.shortRev or self.dirtyShortRev or "dirty"; revision = self.shortRev or self.dirtyShortRev or "dirty";
optimize = "Debug";
}; };
ghostty-releasesafe = pkgs-stable.callPackage ./nix/package.nix { in rec {
inherit (pkgs-zig-0-12) zig_0_12; ghostty-debug = pkgs-stable.callPackage ./nix/package.nix (mkArgs "Debug");
revision = self.shortRev or self.dirtyShortRev or "dirty"; ghostty-releasesafe = pkgs-stable.callPackage ./nix/package.nix (mkArgs "ReleaseSafe");
optimize = "ReleaseSafe"; ghostty-releasefast = pkgs-stable.callPackage ./nix/package.nix (mkArgs "ReleaseFast");
};
ghostty-releasefast = pkgs-stable.callPackage ./nix/package.nix { ghostty = ghostty-releasefast;
inherit (pkgs-zig-0-12) zig_0_12;
revision = self.shortRev or self.dirtyShortRev or "dirty";
optimize = "ReleaseFast";
};
ghostty = ghostty-releasesafe;
default = ghostty; default = ghostty;
}; };

View File

@ -78,7 +78,7 @@ in
mkShell { mkShell {
name = "ghostty"; name = "ghostty";
nativeBuildInputs = packages =
[ [
# For builds # For builds
llvmPackages_latest.llvm llvmPackages_latest.llvm
@ -120,13 +120,7 @@ in
gdb gdb
valgrind valgrind
wraptest wraptest
];
buildInputs =
[
# TODO: non-linux
]
++ lib.optionals stdenv.isLinux [
bzip2 bzip2
expat expat
fontconfig fontconfig