Fix systemd unit location for Bookwyrm, move all mkdir calls to top
This commit is contained in:
parent
c306e47de1
commit
4b505625a7
3 changed files with 5 additions and 10 deletions
|
@ -81,7 +81,9 @@ mkDerivation {
|
||||||
in ''
|
in ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/bin
|
||||||
mkdir -p $out/lib/python3.11/site-packages
|
mkdir -p $out/lib/python3.11/site-packages
|
||||||
|
mkdir -p $out/lib/systemd/system
|
||||||
|
|
||||||
# Python dependencies
|
# Python dependencies
|
||||||
|
|
||||||
|
@ -94,8 +96,6 @@ mkDerivation {
|
||||||
cp -r $src/bookwyrm $out/lib/python3.11/site-packages/
|
cp -r $src/bookwyrm $out/lib/python3.11/site-packages/
|
||||||
cp -r $src/celerywyrm $out/lib/python3.11/site-packages/
|
cp -r $src/celerywyrm $out/lib/python3.11/site-packages/
|
||||||
|
|
||||||
mkdir -p $out/bin
|
|
||||||
|
|
||||||
# Executables
|
# Executables
|
||||||
|
|
||||||
cat <<- EOF > $out/bin/bookwyrm
|
cat <<- EOF > $out/bin/bookwyrm
|
||||||
|
@ -116,11 +116,9 @@ mkDerivation {
|
||||||
|
|
||||||
chmod +x $out/bin/bookwyrm
|
chmod +x $out/bin/bookwyrm
|
||||||
|
|
||||||
mkdir -p $out/etc/systemd/system
|
|
||||||
|
|
||||||
# Systemd units
|
# Systemd units
|
||||||
|
|
||||||
cat <<- EOF > $out/etc/systemd/system/bookwyrm.service
|
cat <<- EOF > $out/lib/systemd/system/bookwyrm.service
|
||||||
[Unit]
|
[Unit]
|
||||||
After=network.target
|
After=network.target
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ mkDerivation {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
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
|
mkdir -p $out/lib/python3.11/site-packages/pgtrigger
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
@ -39,8 +40,6 @@ mkDerivation {
|
||||||
|
|
||||||
# Metadata
|
# 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
|
cat << EOF > $out/lib/python3.11/site-packages/django_pgtrigger-4.13.3.dist-info/METADATA
|
||||||
Metadata-Version: 2.1
|
Metadata-Version: 2.1
|
||||||
Name: django-pgtrigger
|
Name: django-pgtrigger
|
||||||
|
|
|
@ -28,7 +28,7 @@ mkDerivation {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -p $out/lib/python3.11/site-packages
|
mkdir -p $out/lib/python3.11/site-packages/sass_processor
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
|
||||||
|
@ -44,8 +44,6 @@ mkDerivation {
|
||||||
ln -s ${jinja2}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/
|
ln -s ${jinja2}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/
|
||||||
'' else "" }
|
'' else "" }
|
||||||
|
|
||||||
mkdir $out/lib/python3.11/site-packages/sass_processor
|
|
||||||
|
|
||||||
# The package itself
|
# The package itself
|
||||||
|
|
||||||
cp $src/sass_processor/*.py $out/lib/python3.11/site-packages/sass_processor/
|
cp $src/sass_processor/*.py $out/lib/python3.11/site-packages/sass_processor/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue