Merge pull request #147595 from AndersonTorres/new-misc

residualvm: remove

pkgs/applications/misc/lutris/fhsenv.nix

@@ -67,8 +67,6 @@ in buildFHSUserEnv {
 
     # Redream // "redream is not available for the x86_64 architecture"
 
-    # ResidualVM
-    flac
 
     # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
     llvm
@@ -76,6 +74,9 @@ in buildFHSUserEnv {
     # ScummVM
     nasm sndio
 
+    # ResidualVM is now merged with ScummVM and therefore does not exist anymore
+    flac
+
     # Snes9x
     libepoxy minizip
 

pkgs/games/residualvm/default.nix

@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsa-lib
-, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
-, openglSupport ? libGLSupported, libGLU, libGL ? null
-}:
-
-assert openglSupport -> libGL != null && libGLU != null;
-
-stdenv.mkDerivation rec {
-  version = "0.1.1";
-  pname = "residualvm";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2";
-    sha256 = "99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963";
-  };
-
-  buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsa-lib ]
-    ++ lib.optionals openglSupport [ libGL libGLU ];
-
-  configureFlags = [ "--enable-all-engines" ];
-
-  meta = with lib; {
-    description = "Interpreter for LucasArts' Lua-based 3D adventure games";
-    homepage = "http://residualvm.org/";
-    repositories.git = "https://github.com/residualvm/residualvm.git";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}

pkgs/top-level/aliases.nix

@@ -784,6 +784,7 @@ mapAliases ({
   # due to it being inside the linuxPackagesFor function.
   rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14
   recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
+  residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # added 2021-11-27
   retroshare06 = retroshare;
   gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
   qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10

pkgs/top-level/all-packages.nix

@@ -30519,8 +30519,6 @@ with pkgs;
 
   redeclipse = callPackage ../games/redeclipse { };
 
-  residualvm = callPackage ../games/residualvm { };
-
   rftg = callPackage ../games/rftg { };
 
   rigsofrods = callPackage ../games/rigsofrods {