diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-15 00:13:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 00:13:17 -0500 |
| commit | be13df6c76cb2480640d1622f691d6298852a43a (patch) | |
| tree | c9ffb90e3ddbfe83cea75b6b1118e625a9c20443 /pkgs/games | |
| parent | 18571d6f0a11b8c3fcab3f86812499e44575d84a (diff) | |
| parent | abe3475df8fd133045cd01fb14e0d7013cecf66e (diff) | |
| download | nixpkgs-be13df6c76cb2480640d1622f691d6298852a43a.tar nixpkgs-be13df6c76cb2480640d1622f691d6298852a43a.tar.gz nixpkgs-be13df6c76cb2480640d1622f691d6298852a43a.tar.bz2 nixpkgs-be13df6c76cb2480640d1622f691d6298852a43a.tar.lz nixpkgs-be13df6c76cb2480640d1622f691d6298852a43a.tar.xz nixpkgs-be13df6c76cb2480640d1622f691d6298852a43a.tar.zst nixpkgs-be13df6c76cb2480640d1622f691d6298852a43a.zip | |
Merge pull request #75465 from worldofpeace/gnome-args
doc/gnome: update wrapper args example, remove proliferated uses
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/anki/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/games/mnemosyne/default.nix | 11 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index c3caf9105d0..c1ba8851f5c 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 675ce1a402f..779d9a98522 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"; |