git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147595 from AndersonTorres/new-misc

residualvm: remove

commit39777f4c11fe5caa52d301c423160932a277eb22 authorAnderson Torres <torres.anderson.85@protonmail.com> dateSat 27 Nov 2021, 12:23 (5 years ago) parent2e867c4d20dc69
4 files changed+4−33
pkgs/applications/misc/lutris/fhsenv.nix+3−2 pkgs/games/residualvm/default.nix−29 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−2
pkgs/applications/misc/lutris/fhsenv.nix+3−2
@@ -67,8 +67,6 @@ in buildFHSUserEnv {
6767
6868 # Redream // "redream is not available for the x86_64 architecture"
6969
70− # ResidualVM
71− flac
7270
7371 # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
7472 llvm
@@ -76,6 +74,9 @@ in buildFHSUserEnv {
7674 # ScummVM
7775 nasm sndio
7876
77+ # ResidualVM is now merged with ScummVM and therefore does not exist anymore
78+ flac
79+
7980 # Snes9x
8081 libepoxy minizip
8182
pkgs/games/residualvm/default.nixdeleted−29
@@ -1,29 +0,0 @@
1−{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsa-lib
2−, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
3−, openglSupport ? libGLSupported, libGLU, libGL ? null
4−}:
5−
6−assert openglSupport -> libGL != null && libGLU != null;
7−
8−stdenv.mkDerivation rec {
9− version = "0.1.1";
10− pname = "residualvm";
11−
12− src = fetchurl {
13− url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2";
14− sha256 = "99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963";
15− };
16−
17− buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsa-lib ]
18− ++ lib.optionals openglSupport [ libGL libGLU ];
19−
20− configureFlags = [ "--enable-all-engines" ];
21−
22− meta = with lib; {
23− description = "Interpreter for LucasArts' Lua-based 3D adventure games";
24− homepage = "http://residualvm.org/";
25− repositories.git = "https://github.com/residualvm/residualvm.git";
26− license = licenses.gpl2;
27− platforms = platforms.linux;
28− };
29−}
pkgs/top-level/aliases.nix+1
@@ -784,6 +784,7 @@ mapAliases ({
784784 # due to it being inside the linuxPackagesFor function.
785785 rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14
786786 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
787+ residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # added 2021-11-27
787788 retroshare06 = retroshare;
788789 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
789790 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−2
@@ -30519,8 +30519,6 @@ with pkgs;
3051930519
3052030520 redeclipse = callPackage ../games/redeclipse { };
3052130521
30522− residualvm = callPackage ../games/residualvm { };
30523−
3052430522 rftg = callPackage ../games/rftg { };
3052530523
3052630524 rigsofrods = callPackage ../games/rigsofrods {