Revert "Merge branch 'staging-next'"

This reverts commit 41af38f372, reversing changes made to f0fec244ca. Let's delay this. We have some serious regressions.
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
@@ -85,8 +85,8 @@ in stdenv.mkDerivation rec {
    find -L "$out/bin" -type f -executable -print0 \
      | while IFS= read -r -d ''' file; do
      if [[ "''${file}" != *-bin ]]; then
-        echo "Wrapping program $file"
-        wrapGApp "$file"
+        echo "Wrapping program ''${file}"
+        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
      fi
    done
  '';