From a995b6dbb0ea1f4a5faaa9f4a1b40172f5b03b89 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Fri, 22 Dec 2023 13:43:06 -0600
Subject: [PATCH] fix nix package and add ci test for nix package build

---
 .github/workflows/test.yml |  3 +++
 nix/package.nix            | 14 ++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1d0ea907e..0fef0a803 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -138,6 +138,9 @@ jobs:
       - name: Test Dynamic Build
         run: nix develop -c zig build -Dstatic=false
 
+      - name: Test NixOS package build
+        run: nix build .#ghostty
+
   prettier:
     runs-on: ubuntu-latest
     steps:
diff --git a/nix/package.nix b/nix/package.nix
index fccb0a143..2dc69543c 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -138,11 +138,17 @@ in
         else "$out/share/terminfo"
       }
 
-      mkdir -p $terminfo/share
-      cp -r "$terminfo_src" $terminfo/share/terminfo
+      mkdir -p "$out/nix-support"
 
-      mkdir -p $shell_integration
-      cp -r $out/share/shell-integration $shell_integration/shell-integration
+      mkdir -p "$terminfo/share"
+      mv "$terminfo_src" "$terminfo/share/terminfo"
+      ln -sf "$terminfo/share/terminfo" "$terminfo_src"
+      echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages"
+
+      mkdir -p "$shell_integration"
+      mv "$out/share/ghostty/shell-integration" "$shell_integration/shell-integration"
+      ln -sf "$shell_integration/shell-integration" "$out/share/ghostty/shell-integration"
+      echo "$shell_integration" >> "$out/nix-support/propagated-user-env-packages"
     '';
 
     meta = with lib; {