From 7342af702e133b588ddda93a4e9b4cc547c0efb3 Mon Sep 17 00:00:00 2001
From: Lucian Pricop <lucian@newro.co>
Date: Fri, 24 Dec 2021 10:18:07 +0200
Subject: [PATCH] update default.nix

---
 default.nix | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/default.nix b/default.nix
index 9edc85a..6e8d843 100644
--- a/default.nix
+++ b/default.nix
@@ -1,20 +1,23 @@
 { pkgs ? import <nixpkgs> {} }:
 with pkgs;
-{
+let
+  composerEnv = import ./composer-env.nix {
+    inherit (pkgs) stdenv lib writeTextFile fetchurl php unzip phpPackages;
+  };
   phpPack = import ./php-packages.nix {
-      inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
+        inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
+    };
+in
+stdenv.mkDerivation {
+  name = "searchanddisplace-core-source";
+  src = builtins.fetchGit {
+   url = "https://git.law/newroco/searchanddisplace-ingest.git";
+   ref = "master";
   };
-  source = stdenv.mkDerivation {
-      name = "searchanddisplace-core-source";
-      src = builtins.fetchGit {
-       url = "https://git.law/newroco/searchanddisplace-ingest.git";
-       ref = "master";
-      };
 
-      phases = [ "installPhase" ];
-      installPhase = ''
-        cp -r $src $out
-        composer install
-      '';
-    };
+  phases = [ "installPhase" ];
+  installPhase = ''
+    cp -r $src $out
+    composer install
+  '';
 }