From abe3475df8fd133045cd01fb14e0d7013cecf66e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 10 Dec 2019 18:23:57 -0500
Subject: treewide: remove bash snippets in flags

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/games/anki/default.nix      | 11 +++++++----
 pkgs/games/mnemosyne/default.nix | 11 ++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'pkgs/games')

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index c3caf9105d05..c1ba8851f5c4 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -163,10 +163,13 @@ buildPythonApplication rec {
     '';
 
     dontWrapQtApps = true;
-    makeWrapperArgs = [
-        ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
-        "\${qtWrapperArgs[@]}"
-    ];
+
+    preFixup = ''
+      makeWrapperArgs+=(
+        "''${qtWrapperArgs[@]}"
+        --prefix PATH ':' "${lame}/bin:${mplayer}/bin"
+      )
+    '';
 
     # now wrapPythonPrograms from postFixup will add both python and qt env variables
 
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 675ce1a402fa..779d9a98522c 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -33,17 +33,18 @@ python.pkgs.buildPythonApplication rec {
   # No tests/ directrory in tarball
   doCheck = false;
 
-  dontWrapQtApps = true;
-  makeWrapperArgs = [
-    "\${qtWrapperArgs[@]}"
-  ];
-
   postInstall = ''
     mkdir -p $out/share
     mv $out/${python.sitePackages}/$out/share/locale $out/share
     rm -r $out/${python.sitePackages}/nix
   '';
 
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
   meta = {
     homepage = https://mnemosyne-proj.org/;
     description = "Spaced-repetition software";
-- 
cgit 1.4.1