Merge remote-tracking branch 'upstream/master' into HEAD

2018-02-14 21:30:08 +01:00
parent e4bfe5aac9 303c979436
commit 672bb6b4ab
134 changed files with 2619 additions and 2325 deletions
@@ -476,8 +476,6 @@ rec {
        cp ${layer}/* temp/
        chmod ug+w temp/*

-        echo "$(dirname ${storeDir})" >> layerFiles
-        echo '${storeDir}' >> layerFiles
        for dep in $(cat $layerClosure); do
          find $dep >> layerFiles
        done
@@ -291,6 +291,7 @@ let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies,
        mkdir -p $out/bin
        cp -P target/bin/* $out/bin # */
      fi
+      runHook postInstall
    '';
 in