From d114f951652ce847c1920e2152560b53e369d678 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 13 Mar 2023 10:12:32 -0700
Subject: [PATCH] clean up some of the nix package building

---
 Makefile         | 9 ---------
 nix/devshell.nix | 2 --
 nix/package.nix  | 1 +
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 078bba32f..5db8f24ff 100644
--- a/Makefile
+++ b/Makefile
@@ -11,15 +11,6 @@ dev/install:
 	cp zig-out/bin/ghostty ${HOME}/bin/devtty
 .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
 # in this directory next to the Makefile, remove vendor/glad and run this target.
 #
diff --git a/nix/devshell.nix b/nix/devshell.nix
index abea909d6..e606c091d 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -2,7 +2,6 @@
 
 , debugedit
 , flatpak-builder
-, fpm
 , gdb
 , glxinfo
 , nodejs
@@ -67,7 +66,6 @@ in mkShell rec {
 
   nativeBuildInputs = [
     # For builds
-    fpm
     llvmPackages_latest.llvm
     pkg-config
     scdoc
diff --git a/nix/package.nix b/nix/package.nix
index a787fbaf1..e72f4a9c6 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
     export MACH_SDK_PATH=${src}/vendor/mach-sdk
     zig build \
       -Dcpu=baseline \
+      -Dversion-string="${version}-nixdev" \
       --prefix $out \
       install