From 489f166e364ee570e715a150a0fd817bd046f2df Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 4 May 2018 16:35:00 +0200
Subject: [PATCH] Organizr en overlay

---
 configuration.nix                         | 1 +
 overlays/organizr.nix                     | 5 +++++
 organizr.nix => pkgs/organizr/default.nix | 2 +-
 services.nix                              | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 overlays/organizr.nix
 rename organizr.nix => pkgs/organizr/default.nix (95%)

diff --git a/configuration.nix b/configuration.nix
index 6f78b1f15..a77df0024 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -39,6 +39,7 @@
   nixpkgs.overlays = [
     (import ./overlays/riot-web.nix)
     (import ./overlays/lidarr.nix)
+    (import ./overlays/organizr.nix)
   ];
   environment.systemPackages = with pkgs; [
     neovim
diff --git a/overlays/organizr.nix b/overlays/organizr.nix
new file mode 100644
index 000000000..c43ba5c38
--- /dev/null
+++ b/overlays/organizr.nix
@@ -0,0 +1,5 @@
+self: super:
+
+{
+  organizr = super.callPackage ../pkgs/organizr { };
+}
diff --git a/organizr.nix b/pkgs/organizr/default.nix
similarity index 95%
rename from organizr.nix
rename to pkgs/organizr/default.nix
index 54a41de70..5495f3889 100644
--- a/organizr.nix
+++ b/pkgs/organizr/default.nix
@@ -1,4 +1,4 @@
-with import <nixpkgs> {};
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "organizr-${version}";
diff --git a/services.nix b/services.nix
index 8e186b9e2..7c45d6bcc 100644
--- a/services.nix
+++ b/services.nix
@@ -118,7 +118,7 @@ in
     "organizr" = {
       listen = [ { addr = "127.0.0.1"; port = organizr_port; } ];
       locations."/" = {
-        root = (import ./organizr.nix);
+        root = pkgs.organizr;
         index = "index.php";
         extraConfig = ''
           location ~* \.php$ {