clean up some of the nix package building

This commit is contained in:
Mitchell Hashimoto
2023-03-13 10:12:32 -07:00
parent 58d89b6bb3
commit d114f95165
3 changed files with 1 additions and 11 deletions

View File

@ -11,15 +11,6 @@ dev/install:
cp zig-out/bin/ghostty ${HOME}/bin/devtty cp zig-out/bin/ghostty ${HOME}/bin/devtty
.PHONY: dev/install .PHONY: dev/install
# Create a binary deb. This isn't meant for general purpose use. This is just
# for testing. General purpose should use a real package manager (I don't
# maintain it at the moment).
deb:
rm -rf zig-out/
zig build -Doptimize=ReleaseFast -Dapp-runtime=gtk
fpm -C zig-out/ -s dir -t deb -n ghostty --prefix /usr ./
.PHONY: deb
# glad updates the GLAD loader. To use this, place the generated glad.zip # glad updates the GLAD loader. To use this, place the generated glad.zip
# in this directory next to the Makefile, remove vendor/glad and run this target. # in this directory next to the Makefile, remove vendor/glad and run this target.
# #

View File

@ -2,7 +2,6 @@
, debugedit , debugedit
, flatpak-builder , flatpak-builder
, fpm
, gdb , gdb
, glxinfo , glxinfo
, nodejs , nodejs
@ -67,7 +66,6 @@ in mkShell rec {
nativeBuildInputs = [ nativeBuildInputs = [
# For builds # For builds
fpm
llvmPackages_latest.llvm llvmPackages_latest.llvm
pkg-config pkg-config
scdoc scdoc

View File

@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
export MACH_SDK_PATH=${src}/vendor/mach-sdk export MACH_SDK_PATH=${src}/vendor/mach-sdk
zig build \ zig build \
-Dcpu=baseline \ -Dcpu=baseline \
-Dversion-string="${version}-nixdev" \
--prefix $out \ --prefix $out \
install install