diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 08:13:10 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-10 17:54:57 +0200 |
| commit | 9b6789de7386edd9e7d199a8e15cb1c3c1f026b3 (patch) | |
| tree | 7e25b243a9b210da74318fc3dae59f6a7c38f3c3 /pkgs/applications | |
| parent | 9d152886ab7276d1c229133c15be170486f78cdd (diff) | |
| download | nixlib-9b6789de7386edd9e7d199a8e15cb1c3c1f026b3.tar nixlib-9b6789de7386edd9e7d199a8e15cb1c3c1f026b3.tar.gz nixlib-9b6789de7386edd9e7d199a8e15cb1c3c1f026b3.tar.bz2 nixlib-9b6789de7386edd9e7d199a8e15cb1c3c1f026b3.tar.lz nixlib-9b6789de7386edd9e7d199a8e15cb1c3c1f026b3.tar.xz nixlib-9b6789de7386edd9e7d199a8e15cb1c3c1f026b3.tar.zst nixlib-9b6789de7386edd9e7d199a8e15cb1c3c1f026b3.zip | |
tree-wide: replace wrapProgram with wrapGApp
where appropriate
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/gnome-photos/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/mysql-workbench/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index f591dd5a60dd..ea4cf986f399 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}" + wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" ''; passthru = { diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 172f999223a8..135745feec31 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -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}" - wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + echo "Wrapping program $file" + wrapGApp "$file" fi done ''; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3d169f501043..ac9362990a8c 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") - wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}" + wrapGApp "$out/bin/kicad" ''; meta = { |