Merge pull request #75465 from worldofpeace/gnome-args

doc/gnome: update wrapper args example, remove proliferated uses
2019-12-15 00:13:17 -05:00
parent 18571d6f0a abe3475df8
commit be13df6c76
10 changed files with 74 additions and 60 deletions
@@ -199,9 +199,9 @@ python3.pkgs.buildPythonApplication {
  dontWrapGApps = true;

  # Arguments to be passed to `makeWrapper`, only used by buildPython*
-  makeWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
-  ];
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
 }
 </programlisting>
      And for a QT app like:
@@ -219,9 +219,9 @@ mkDerivation {
  dontWrapGApps = true;

  # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
-  qtWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
-  ];
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
 }
 </programlisting>
     </para>