Merge pull request #75465 from worldofpeace/gnome-args

doc/gnome: update wrapper args example, remove proliferated uses

doc/languages-frameworks/gnome.xml

@@ -199,9 +199,9 @@ python3.pkgs.buildPythonApplication {
   dontWrapGApps = true;
 
   # Arguments to be passed to `makeWrapper`, only used by buildPython*
-  makeWrapperArgs = [
+  preFixup = ''
-    "\${gappsWrapperArgs[@]}"
+    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 = [
+  preFixup = ''
-    "\${gappsWrapperArgs[@]}"
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  ];
+  '';
 }
 </programlisting>
      </para>

pkgs/applications/audio/lollypop/default.nix

@@ -79,9 +79,9 @@ python3.pkgs.buildPythonApplication rec  {
   # argument
   dontWrapGApps = true;
 
-  makeWrapperArgs = [
+  preFixup = ''
-    "\${gappsWrapperArgs[@]}"
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  ];
+  '';
 
   meta = with lib; {
     changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";

pkgs/applications/graphics/rapid-photo-downloader/default.nix

@@ -67,14 +67,16 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     tenacity
   ];
 
-  makeWrapperArgs = [
+  preFixup = ''
-    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
+    makeWrapperArgs+=(
-    "--set PYTHONPATH \"$PYTHONPATH\""
+      --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"
-    "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool vmtouch ]}"
+      --set PYTHONPATH "$PYTHONPATH"
-    "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ exiftool vmtouch ]}"
-    "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
+      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libmediainfo ]}"
-    "\${qtWrapperArgs[@]}"
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
-  ];
+      "''${qtWrapperArgs[@]}"
+    )
+  '';
 
   meta = with stdenv.lib; {
     description = "Photo and video importer for cameras, phones, and memory cards";

pkgs/applications/misc/multibootusb/default.nix

@@ -52,17 +52,6 @@ python36Packages.buildPythonApplication rec {
     python36Packages.six
   ];
 
-  makeWrapperArgs = [
-    # Firstly, add all necessary QT variables
-    "\${qtWrapperArgs[@]}"
-
-    # Then, add the installed scripts/ directory to the python path
-    "--prefix" "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages"
-
-    # Finally, move to directory that contains data
-    "--run" "\"cd $out/share/${pname}\""
-  ];
-
   postInstall = ''
     # This script doesn't work and it doesn't add much anyway
     rm $out/bin/multibootusb-pkexec
@@ -72,6 +61,19 @@ python36Packages.buildPythonApplication rec {
     cp -r data "$out/share/${pname}/data"
   '';
 
+  preFixup = ''
+    makeWrapperArgs+=(
+      # Firstly, add all necessary QT variables
+      "''${qtWrapperArgs[@]}"
+
+      # Then, add the installed scripts/ directory to the python path
+      --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages"
+
+      # Finally, move to directory that contains data
+      --run "cd $out/share/${pname}"
+    )
+  '';
+
   meta = with stdenv.lib; {
     description = "Multiboot USB creator for Linux live disks";
     homepage = http://multibootusb.org/;

pkgs/applications/misc/plover/default.nix

@@ -47,8 +47,9 @@
     propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
 
     dontWrapQtApps = true;
-    makeWrapperArgs = [
+
-      "\${qtWrapperArgs[@]}"
+    preFixup = ''
-    ];
+      makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+    '';
   };
 }

pkgs/applications/networking/browsers/webmacs/default.nix

@@ -27,18 +27,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     pygments
   ];
 
-  dontWrapQtApps = true;
-
-  makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
-
-  # See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32
-  # Don't know why they're using CC for g++.
-  preConfigure = ''
-   export CC=$CXX
-  '';
-
-  doCheck = false; # test dependencies not packaged up yet
-
   checkInputs = [
     python3Packages.pytest
     #python3Packages.pytest-xvfb
@@ -53,6 +41,20 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     # python3Packages.flake8
   ];
 
+  # See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32
+  # Don't know why they're using CC for g++.
+  preConfigure = ''
+   export CC=$CXX
+  '';
+
+  doCheck = false; # test dependencies not packaged up yet
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
   meta = with lib; {
     description = "Keyboard-based web browser with Emacs/conkeror heritage";
     longDescription = ''

pkgs/applications/networking/instant-messengers/blink/default.nix

@@ -44,11 +44,6 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
 
   dontWrapQtApps = true;
 
-  makeWrapperArgs = [
-    "\${qtWrapperArgs[@]}"
-    "--prefix LD_LIBRARY_PATH: ${gnutls.out}/lib"
-  ];
-
   postInstall = ''
     mkdir -p "$out/share/applications"
     mkdir -p "$out/share/pixmaps"
@@ -56,6 +51,13 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
     cp "$out"/share/blink/icons/blink.* "$out/share/pixmaps"
   '';
 
+  preFixup = ''
+    makeWrapperArgs+=(
+      --prefix "LD_LIBRARY_PATH" ":" "${gnutls.out}/lib"
+      "''${qtWrapperArgs[@]}"
+    )
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://icanblink.com/;
     description = "A state of the art, easy to use SIP client for Voice, Video and IM";

pkgs/development/python-modules/spyder/default.nix

@@ -50,9 +50,10 @@ buildPythonPackage rec {
   '';
 
   dontWrapQtApps = true;
-  makeWrapperArgs = [
+
-    "\${qtWrapperArgs[@]}"
+  preFixup = ''
-  ];
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
 
   meta = with stdenv.lib; {
     description = "Scientific python development environment";

pkgs/games/anki/default.nix

@@ -163,10 +163,13 @@ buildPythonApplication rec {
     '';
 
     dontWrapQtApps = true;
-    makeWrapperArgs = [
+
-        ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
+    preFixup = ''
-        "\${qtWrapperArgs[@]}"
+      makeWrapperArgs+=(
-    ];
+        "''${qtWrapperArgs[@]}"
+        --prefix PATH ':' "${lame}/bin:${mplayer}/bin"
+      )
+    '';
 
     # now wrapPythonPrograms from postFixup will add both python and qt env variables
 

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";