diff options
| author | aszlig <aszlig@nix.build> | 2021-06-16 01:04:12 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2021-06-16 01:07:35 +0200 |
| commit | ba0210f7cedab6e004164adfb2ff106517150c8e (patch) | |
| tree | 8ed18ed0daca96930da0321ec8224df96368ddd9 | |
| parent | 4972e696285833ed542eaab1034218bf5e8b7232 (diff) | |
treewide: Replace xvfb_run with xvfb-run
Another alias that has been introduced not too long ago[1] and now more closely resembles the actual command name. Since NixOS VM tests no longer allow aliases, our sandbox tests did not evaluate anymore. While at it, I also renamed all the other uses of the alias. [1]: https://github.com/NixOS/nixpkgs/commit/726306003af21ade95b1908d1920ce9a0f9815bb Signed-off-by: aszlig <aszlig@nix.build>
| -rw-r--r-- | pkgs/games/gog/the-longest-journey/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/gog/warcraft2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/gog/xeen.nix | 4 | ||||
| -rw-r--r-- | tests/sandbox.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/games/gog/the-longest-journey/default.nix b/pkgs/games/gog/the-longest-journey/default.nix index 9dca199a..64e24c13 100644 --- a/pkgs/games/gog/the-longest-journey/default.nix +++ b/pkgs/games/gog/the-longest-journey/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchGog, fetchFromGitHub, innoextract, runCommand, buildSandbox , SDL2, SDL2_net, freetype, libGLU_combined, glew, alsaLib -, libogg, libvorbis, xvfb_run +, libogg, libvorbis, xvfb-run }: let @@ -68,7 +68,7 @@ let }; configFile = runCommand "residualvm-stark.ini" { - nativeBuildInputs = [ xvfb_run residualvm ]; + nativeBuildInputs = [ xvfb-run residualvm ]; inherit gameData; } '' xvfb-run residualvm -p "$gameData" -a diff --git a/pkgs/games/gog/warcraft2/default.nix b/pkgs/games/gog/warcraft2/default.nix index 13802424..448a860a 100644 --- a/pkgs/games/gog/warcraft2/default.nix +++ b/pkgs/games/gog/warcraft2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildSandbox, writeTextFile, runCommand, fetchGog, fetchurl -, fetchFromGitHub, winePackages, xvfb_run, ffmpeg, rename +, fetchFromGitHub, winePackages, xvfb-run, ffmpeg, rename # Dependencies for the Stratagus engine , cmake, pkg-config, toluapp, lua5_1, libpng, libmng, zlib, SDL, fluidsynth @@ -121,7 +121,7 @@ let downloadName = "en1installer0"; sha256 = "1cf3c1ylgdrvkk7y25v47f66m6lp9m4wvl2aldpxzrrqdrlk34k3"; }; - nativeBuildInputs = [ winePackages.minimal xvfb_run ffmpeg wargus rename ]; + nativeBuildInputs = [ winePackages.minimal xvfb-run ffmpeg wargus rename ]; } '' export WINEPREFIX="$PWD" wine wineboot.exe diff --git a/pkgs/games/gog/xeen.nix b/pkgs/games/gog/xeen.nix index e5e65fc8..506c3a05 100644 --- a/pkgs/games/gog/xeen.nix +++ b/pkgs/games/gog/xeen.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildSandbox, fetchGog, gogUnpackHook, bchunk, p7zip , scummvm, fetchFromGitHub -, runCommand, xvfb_run +, runCommand, xvfb-run , showItemCosts ? true , durableArmor ? true @@ -86,7 +86,7 @@ let injectOption = c: o: lib.optionalString c "-e '/^\\[worldof/a ${o}=true'"; scummVmConfig = runCommand "scummvm-xeen.ini" { - nativeBuildInputs = [ xvfb_run latestScummVM ]; + nativeBuildInputs = [ xvfb-run latestScummVM ]; inherit gameData; } '' xvfb-run scummvm -p "$gameData" -a diff --git a/tests/sandbox.nix b/tests/sandbox.nix index b3ad80d1..69cc746b 100644 --- a/tests/sandbox.nix +++ b/tests/sandbox.nix @@ -103,7 +103,7 @@ in [ # Unfortunately, "xdg-open test-sandbox.desktop" doesn't work, so let's - # use gtk-launch instead. We also need xvfb_run so that we can avoid to + # use gtk-launch instead. We also need xvfb-run so that we can avoid to # start a full-blown X server. # # See also: @@ -111,7 +111,7 @@ # https://askubuntu.com/questions/5172 # https://bugs.launchpad.net/ubuntu/+source/gvfs/+bug/378783 # - (lib.getBin pkgs.gtk3) pkgs.xvfb_run + (lib.getBin pkgs.gtk3) pkgs.xvfb-run (pkgs.vuizvui.buildSandbox testPackage { paths.required = [ |