From d635d0820026326a830c6c937ff84f6f017c3232 Mon Sep 17 00:00:00 2001
From: vuko <vuko@hackerspace.pl>
Date: Mon, 14 Feb 2022 22:34:37 +0100
Subject: [PATCH] fix pkgs dependency

---
 default.nix | 6 +++---
 service.nix | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index 549da4e..d9c7a08 100644
--- a/default.nix
+++ b/default.nix
@@ -1,12 +1,12 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ gunicorn, flask, paho-mqtt, pyyaml, setuptools, buildPythonPackage }:
 
-pkgs.python3Packages.buildPythonPackage {
+buildPythonPackage {
   pname = "lights-web";
   version = "0.4.0";
 
   src = ./.;
 
-  propagatedBuildInputs = with pkgs.python3Packages; [
+  propagatedBuildInputs = [
     gunicorn flask paho-mqtt pyyaml setuptools
   ];
 }
diff --git a/service.nix b/service.nix
index bc83e25..8b30c9c 100644
--- a/service.nix
+++ b/service.nix
@@ -43,7 +43,7 @@ in {
       ln -s ${paho}/src/paho-mqtt.js static/paho-mqtt.js
       popd
     '';
-    lights-web = pkgs.callPackage ./default.nix {};
+    lights-web = pkgs.python3Packages.callPackage ./default.nix {};
 
     user = name;
     python = pkgs.python3.withPackages (pp:[ lights-web pp.gunicorn ]);
@@ -69,6 +69,7 @@ in {
     users.users."${user}" = {
       group = "users";
       useDefaultShell = true;
+      isSystemUser = true;
     };
 
     systemd.services."${name}" = {
@@ -93,9 +94,12 @@ in {
       {
       locations."/static/" = {
         root = "${static-files}/";
+        extraConfig = ''
+          include ${pkgs.nginx}/conf/mime.types;
+        '';
       };
       locations."/" = {
-        proxyPass = "http://unix://${socket_dir}/web.sock";
+        proxyPass = "http://unix:${socket_dir}/web.sock";
         extraConfig = ''
           proxy_set_header Host $host;
           proxy_set_header X-Real-IP $remote_addr;