Merge branch 'master' into staging-next

2018-08-30 21:56:13 +02:00
parent 91b01208a0 efb16b5829
commit a9780a095b
95 changed files with 1171 additions and 395 deletions
@@ -34,13 +34,11 @@ stdenv.mkDerivation rec {
    makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \
      --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \
      --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then
-        mkdir -p "$SYMPOW_LOCAL"
-        cp -r @out@/share/sympow/* "$SYMPOW_LOCAL"
+        mkdir -p "$SYMPOW_LOCAL" 
+        cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL"
        chmod -R +xw "$SYMPOW_LOCAL"
    fi' \
      --run 'cd "$SYMPOW_LOCAL"'
-    substituteInPlace $out/bin/sympow --subst-var out
-
    runHook postInstall
  '';