diff --git a/composer.json b/composer.json index 3025b2a..d85d460 100644 --- a/composer.json +++ b/composer.json @@ -47,10 +47,6 @@ "minimum-stability": "dev", "prefer-stable": true, "scripts": { - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover --ansi" - ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], diff --git a/default.nix b/default.nix index 6e8d843..0df6cda 100644 --- a/default.nix +++ b/default.nix @@ -1,23 +1,13 @@ -{ pkgs ? import {} }: -with pkgs; +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, noDev ? false}: + 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; - }; in -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 - ''; +import ./php-packages.nix { + inherit composerEnv noDev; + inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn; }