From 4b505625a7b19aba7b8eca670e5690e2a2103ad3 Mon Sep 17 00:00:00 2001
From: Reinout Meliesie <zedfrigg@kernelmaft.com>
Date: Tue, 4 Mar 2025 11:29:42 +0100
Subject: [PATCH] Fix systemd unit location for Bookwyrm, move all mkdir calls
 to top

---
 bookwyrm.nix                         | 8 +++-----
 python3.11-django-pgtrigger.nix      | 3 +--
 python3.11-django-sass-processor.nix | 4 +---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/bookwyrm.nix b/bookwyrm.nix
index c05cd56..66e03ec 100644
--- a/bookwyrm.nix
+++ b/bookwyrm.nix
@@ -81,7 +81,9 @@ mkDerivation {
 	in ''
 		runHook preInstall
 
+		mkdir -p $out/bin
 		mkdir -p $out/lib/python3.11/site-packages
+		mkdir -p $out/lib/systemd/system
 
 		# Python dependencies
 
@@ -94,8 +96,6 @@ mkDerivation {
 		cp -r $src/bookwyrm $out/lib/python3.11/site-packages/
 		cp -r $src/celerywyrm $out/lib/python3.11/site-packages/
 
-		mkdir -p $out/bin
-
 		# Executables
 
 		cat <<- EOF > $out/bin/bookwyrm
@@ -116,11 +116,9 @@ mkDerivation {
 
 		chmod +x $out/bin/bookwyrm
 
-		mkdir -p $out/etc/systemd/system
-
 		# Systemd units
 
-		cat <<- EOF > $out/etc/systemd/system/bookwyrm.service
+		cat <<- EOF > $out/lib/systemd/system/bookwyrm.service
 			[Unit]
 			After=network.target
 
diff --git a/python3.11-django-pgtrigger.nix b/python3.11-django-pgtrigger.nix
index 4ed6ce0..d4b97a2 100644
--- a/python3.11-django-pgtrigger.nix
+++ b/python3.11-django-pgtrigger.nix
@@ -25,6 +25,7 @@ mkDerivation {
 	installPhase = ''
 		runHook preInstall
 
+		mkdir -p $out/lib/python3.11/site-packages/django_pgtrigger-4.13.3.dist-info
 		mkdir -p $out/lib/python3.11/site-packages/pgtrigger
 
 		# Dependencies
@@ -39,8 +40,6 @@ mkDerivation {
 
 		# Metadata
 
-		mkdir -p $out/lib/python3.11/site-packages/django_pgtrigger-4.13.3.dist-info
-
 		cat << EOF > $out/lib/python3.11/site-packages/django_pgtrigger-4.13.3.dist-info/METADATA
 			Metadata-Version: 2.1
 			Name: django-pgtrigger
diff --git a/python3.11-django-sass-processor.nix b/python3.11-django-sass-processor.nix
index 49fec64..17624ff 100644
--- a/python3.11-django-sass-processor.nix
+++ b/python3.11-django-sass-processor.nix
@@ -28,7 +28,7 @@ mkDerivation {
 	installPhase = ''
 		runHook preInstall
 
-		mkdir -p $out/lib/python3.11/site-packages
+		mkdir -p $out/lib/python3.11/site-packages/sass_processor
 
 		# Dependencies
 
@@ -44,8 +44,6 @@ mkDerivation {
 			ln -s ${jinja2}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/
 		'' else "" }
 
-		mkdir $out/lib/python3.11/site-packages/sass_processor
-
 		# The package itself
 
 		cp $src/sass_processor/*.py $out/lib/python3.11/site-packages/sass_processor/