diff --git a/default.nix b/default.nix index 9edc85a..6e8d843 100644 --- a/default.nix +++ b/default.nix @@ -1,20 +1,23 @@ { pkgs ? import {} }: 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 + ''; }