From 8a796822183197cf3d4a41dec9c7a798364ba4ee Mon Sep 17 00:00:00 2001
From: Lucian Pricop <lucian@newro.co>
Date: Sat, 25 Apr 2020 16:21:31 +0300
Subject: [PATCH] more nix improvements

---
 pkgs/nixexprs.tar.xz | Bin 552 -> 320 bytes
 pkgs/sandd-main.nix  |  34 ++++++++++++++++++++++++++++++++++
 pkgs/sandd.nix       |  32 +++++---------------------------
 readme.md            |   2 +-
 4 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/sandd-main.nix

diff --git a/pkgs/nixexprs.tar.xz b/pkgs/nixexprs.tar.xz
index 7eb4b6df7547ce738387c7c3515c1230ccb1e0cc..8499078fbf237f488a54ada6c680e02d860efc39 100644
GIT binary patch
delta 271
zcmV+q0r38)1i%82903549U^}-9_`G^fWSC<4We{q%4~>csD2euFi_80v9(;E47+)b
z%tlR<@XEv=S3t!R+&9n;X2cVR4BgHOwUf-pOFvjo>^9_5=p0v%aD7dMHI-bb7Q+(-
z>PrteSSbqRAfY^ZhDvJ!lx3|&@&a_lR-*+h+u%|D^0}!oPeYR{HC%u8AI2YIs+V2$
z)7g7B{m5=Og52mCG8Iz0dfrNN`JClj27z73u)4<XRDv0<Bl!+ftoyK5)Rw}Ao&;*l
z#HP^%Ayv)!v-V>Fb`N2ir?Jl(sd%#>;+}mxHvM&NrvW|y0B-uI9%_n(z5oH70)S8e
V01nC2QnAEm`vL#}00097Sz4;Ye3k$J

delta 504
zcmV<U0SErT0;mL#90BK%9U_0tG}9T}ry?XsfBN0P<YhVO8VozRX1Uc@MNt4JH2!{^
zueR%Dy?neT@eGU_smh_Zx@1;#t|zzO%ApxOa6V`&ur_nx58;QR5}<_W=+Jq<wnu1h
zs%$ac8>CM1ehI@UNXPV34DRs1H|OE|FrZ<%9hi@T8X`WA9Ybb-Da?Q54oOYwb)OhC
zD1|Om3zvgGH_WUT3YIr!L&u+inW<@*uf_=M-N5`J*}e{#Kn`@q2H%I8uJ<762EBGP
z5yBk}9dtAw$SJ|$U|*6Uk$0Lw;Q7F;8J30&67IkN#-3Nflx<;z1ee%iyC|SxkmJ{M
zRFmgSS*(r|K*wmUf3JT6cwaKj+Ap}cc}|d7ky45<dE@Ji34hm)qh=b>cG1nUg=ZHn
z+|>&CH!DkN6!`Zha@o?m5WZmzHG(=yD*I0;s7BTf?YJAq;zN+Pj!kL6_)fs65dw*a
zclz`VuD2`1i^6~`bZ)KjOhaFEZtNzSnnFeUHdoO<N^{?BRzYl#JrD)j$$tf4c~4XM
z?eTrNk1~qE4_OjNt$^mr0CgQNqj$Sfep@ZRAo%HRdJ`>2aMrS2f%l4kNW<M2rdYAY
uhE5WXd@6)a0000=86vdOH@?IG0fPj9Pyhhnj1(`i#Ao{g000001X)^jx9)-f

diff --git a/pkgs/sandd-main.nix b/pkgs/sandd-main.nix
new file mode 100644
index 0000000..9d5a7d5
--- /dev/null
+++ b/pkgs/sandd-main.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchGit, sbcl, unzip, curl, git, openssl, php, phpPackages, nodejs}:
+let
+  name = "search-and-displace";
+  gitStore = builtins.fetchGit {
+      url = "https://github.com/searchanddisplace/searchanddisplace.git";
+      #url = "https://github.com/newroco/rocket_integration.git";
+      ref = "master";
+  };
+  inherit (phpPackages) composer;
+  buildPackage = { name, src }:
+      stdenv.mkDerivation {
+        inherit name src;
+        buildInputs = [ curl git openssl php composer nodejs ];
+        buildCommand = ''
+           #cd $src
+           #composer update
+           #composer install
+           #npm install
+           # cp .env.example .env
+           mkdir -p $out
+           cp -R $src/* $out
+           mv * $out
+           # Remove unwanted files - that is impossible with, nix, give up...
+           #rm -f $out/*.nix
+           #rm -R $out/pkgs
+           # Remove stuff not needed on production - composer.lock, composer.json, etc, etc  - that is impossible with, nix, give up...
+         '';
+      };
+in
+buildPackage {
+    inherit name;
+    #src = ./.;
+    src = gitStore;
+}
diff --git a/pkgs/sandd.nix b/pkgs/sandd.nix
index b774970..2771d0a 100644
--- a/pkgs/sandd.nix
+++ b/pkgs/sandd.nix
@@ -1,28 +1,6 @@
-{ pkgs ? import <nixpkgs> {
+{pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem
-}:
-let
-  name = "search-and-displace";
-  inherit (pkgs) stdenv git curl php phpPackages;
-  inherit (phpPackages) composer;
-  gitStore = builtins.fetchGit {
-      url = "https://github.com/searchanddisplace/searchanddisplace.git";
-      ref = "master";
-  };
-  buildPackage = { name, src }:
-      stdenv.mkDerivation {
-        inherit name src;
-        buildInputs = [ ];
-        buildCommand = ''
-          composer install
-          npm install
-          cp .env.example .env
-          # Remove stuff not needed on production - composer.loc, .json, etc, etc
-        '';
-      };
-in
-buildPackage {
-    inherit name;
-    src = gitStore;
-}
+  }, system ? builtins.currentSystem}:
+import ./sandd-main.nix {
+  inherit (pkgs) stdenv  fetchGit  sbcl  unzip  curl  git  openssl  php phpPackages nodejs;
+}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index ee2e324..d9335cb 100644
--- a/readme.md
+++ b/readme.md
@@ -20,7 +20,7 @@ nix-channel --update
 
 You can now install search-and-displace:
 ```bash
-nix-env -iA search-and-displace
+nix-env -i search-and-displace
 ```
 ## :roller_coaster: Usage