X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Fcommons%2Fcomposer-env.nix;h=416a61cab39567d15e433680325742a7409cd4b2;hb=bb3210df1f8f09f34b196a8f8bec42bbc7573bd5;hp=abc8f014a079e3425b30b1324d22f5f4417c5236;hpb=85545c3fc60140bca90a3c2e49f41ff6bdd93c79;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/commons/composer-env.nix b/virtual/modules/websites/commons/composer-env.nix
index abc8f01..416a61c 100644
--- a/virtual/modules/websites/commons/composer-env.nix
+++ b/virtual/modules/websites/commons/composer-env.nix
@@ -63,6 +63,7 @@ let
     , noDev ? false
     , unpackPhase ? "true"
     , buildPhase ? "true"
+    , doRemoveVendor ? true
     , ...}@args:
 
     let
@@ -152,7 +153,7 @@ let
               ${if symlinkDependencies then
                 ''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
                 else
-                ''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
+                ''cp -a "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
               }${if dependency.needsModifyRights or false then "\n" + ''
                 chmod -R u+rwx "$vendorDir/$(basename "${dependencyName}")"
             '' else ""}
@@ -162,7 +163,7 @@ let
               ${if symlinkDependencies then
                 ''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
               else
-                ''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
+                ''cp -a "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
               }${if dependency.needsModifyRights or false then "\n" + ''
                 chmod -R u+rwx "$namespaceDir/$(basename "${dependency.targetDir}")"
             '' else ""}
@@ -180,11 +181,11 @@ let
       installPhase = ''
         ${if executable then ''
           mkdir -p $out/share/php
-          cp -av $src $out/share/php/$name
+          cp -a $src $out/share/php/$name
           chmod -R u+w $out/share/php/$name
           cd $out/share/php/$name
         '' else ''
-          cp -av $src $out
+          cp -a $src $out
           chmod -R u+w $out
           cd $out
         ''}
@@ -197,9 +198,10 @@ let
 
         export HOME=$TMPDIR
 
+        ${if doRemoveVendor then ''
         # Remove the provided vendor folder if it exists
         rm -Rf vendor
-
+        '' else ""}
         # If there is no composer.lock file, compose a dummy file.
         # Otherwise, composer attempts to download the package.json file from
         # the registry which we do not want.