From 08fa8b9c604d1127e2d02bf9846b86cb2c9bd12a Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 13 Feb 2019 19:13:10 +0100 Subject: games: Use "mono" instead of "mono50" The use of mono50 was just an old relic where I was debugging some issue with a game, but I used it as a template for packaging other games, so it spread throughout the code base. I've tested all these games just to make sure they still work with the latest version. Signed-off-by: aszlig --- pkgs/games/gog/stardew-valley.nix | 4 ++-- pkgs/games/humblebundle/opus-magnum.nix | 4 ++-- pkgs/games/humblebundle/owlboy.nix | 4 ++-- pkgs/games/itch/towerfall-ascension.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/gog/stardew-valley.nix b/pkgs/games/gog/stardew-valley.nix index 820e98de..144202c0 100644 --- a/pkgs/games/gog/stardew-valley.nix +++ b/pkgs/games/gog/stardew-valley.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildGame, fetchGog, makeWrapper -, mono50, SDL2, libGL, openal +, mono, SDL2, libGL, openal }: buildGame rec { @@ -48,7 +48,7 @@ buildGame rec { install -vD "lib$bitSuffix/libGalaxyCSharpGlue.so" \ "$out/libexec/stardew-valley/libGalaxyCSharpGlue.so" - makeWrapper ${lib.escapeShellArg mono50}/bin/mono \ + makeWrapper ${lib.escapeShellArg mono}/bin/mono \ "$out/bin/stardew-valley" \ --add-flags "$out/libexec/stardew-valley/StardewValley.exe" \ --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg "${libGL}/lib"} \ diff --git a/pkgs/games/humblebundle/opus-magnum.nix b/pkgs/games/humblebundle/opus-magnum.nix index f7b2a244..07845a68 100644 --- a/pkgs/games/humblebundle/opus-magnum.nix +++ b/pkgs/games/humblebundle/opus-magnum.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGame, fetchHumbleBundle, makeWrapper, mono50 +{ stdenv, lib, buildGame, fetchHumbleBundle, makeWrapper, mono , SDL2, SDL2_image, SDL2_mixer, libvorbis }: @@ -34,7 +34,7 @@ buildGame rec { cp -rvt "$out/share/opus-magnum" Content PackedContent cp -rvt "$out/libexec/opus-magnum" Lightning.exe* Ionic.Zip.Reduced.dll - makeWrapper ${lib.escapeShellArg mono50}/bin/mono "$out/bin/opus-magnum" \ + makeWrapper ${lib.escapeShellArg mono}/bin/mono "$out/bin/opus-magnum" \ --add-flags "$out/libexec/opus-magnum/Lightning.exe" \ --run "cd '$out/share/opus-magnum'" ''; diff --git a/pkgs/games/humblebundle/owlboy.nix b/pkgs/games/humblebundle/owlboy.nix index a6c42577..3324ce43 100644 --- a/pkgs/games/humblebundle/owlboy.nix +++ b/pkgs/games/humblebundle/owlboy.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGame, fetchHumbleBundle, unzip, makeWrapper, mono50 +{ stdenv, lib, buildGame, fetchHumbleBundle, unzip, makeWrapper, mono , SDL2, SDL2_image, openal, libvorbis , writeText }: @@ -89,7 +89,7 @@ buildGame rec { cp -rvt "$out/lib/owlboy" "$libdir/libmojoshader.so" ln -vs "$out/share/owlboy" "$out/libexec/owlboy/content" - makeWrapper ${lib.escapeShellArg mono50}/bin/mono \ + makeWrapper ${lib.escapeShellArg mono}/bin/mono \ "$out/bin/owlboy" \ --set LD_PRELOAD "$out/lib/owlboy/preloader.so" \ --add-flags "$out/libexec/owlboy/Owlboy.exe" \ diff --git a/pkgs/games/itch/towerfall-ascension.nix b/pkgs/games/itch/towerfall-ascension.nix index 21704211..5028bc98 100644 --- a/pkgs/games/itch/towerfall-ascension.nix +++ b/pkgs/games/itch/towerfall-ascension.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGame, fetchItch, makeWrapper, p7zip, unzip, mono50 +{ stdenv, lib, buildGame, fetchItch, makeWrapper, p7zip, unzip, mono , SDL2, SDL2_image, libGL, libvorbis, openal, monogamePatcher, writeScriptBin , coreutils @@ -34,7 +34,7 @@ buildGame rec { Texture IntroScene SFX SFXVaried ''; - nativeBuildInputs = [ makeWrapper mono50 monogamePatcher ]; + nativeBuildInputs = [ makeWrapper mono monogamePatcher ]; libdir = if stdenv.system == "x86_64-linux" then "lib64" else "lib"; @@ -78,7 +78,7 @@ buildGame rec { "TowerFall Dark World Expansion/DarkWorldContent" fi - makeWrapper ${lib.escapeShellArg mono50}/bin/mono \ + makeWrapper ${lib.escapeShellArg mono}/bin/mono \ "$out/bin/towerfall-ascension" \ --set SDL_OPENGL_LIBRARY ${lib.escapeShellArg "${libGL}/lib/libGL.so"} \ --set PATH "$dummyXdgOpen/bin" \ -- cgit 1.4.1