diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9e000409f446..e29e30d7a89e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6515,10 +6515,14 @@ name = "Matthias C. M. Troffaes"; }; McSinyx = { - email = "vn.mcsinyx@gmail.com"; + email = "mcsinyx@disroot.org"; github = "McSinyx"; githubId = 13689192; name = "Nguyễn Gia Phong"; + keys = [{ + longkeyid = "rsa3072/0x27148B2C06A2224B"; + fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; + }]; }; mcwitt = { email = "mcwitt@gmail.com"; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 7fe4a6087f79..263d92dcea63 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,34 +1,37 @@ -{lib, stdenv, fetchsvn, SDL, libGLU, libGL, openal, libvorbis, freealut, SDL_image}: +{ lib, stdenv, fetchFromSourcehut +, SDL, SDL_image, libGLU, libGL, openal, libvorbis, freealut }: -stdenv.mkDerivation { - name = "blackshades-svn-110"; - src = fetchsvn { - url = "svn://svn.icculus.org/blackshades/trunk"; - rev = "110"; - sha256 = "0kbrh1dympk8scjxr6av24qs2bffz44l8qmw2m5gyqf4g3rxf6ra"; +stdenv.mkDerivation rec { + pname = "blackshades"; + version = "1.1.1"; + + src = fetchFromSourcehut { + owner = "~cnx"; + repo = pname; + rev = version; + sha256 = "1gx43hcqahbd21ib8blhzmsrwqfzx4qy7f10ck0mh2zc4bfihz64"; }; - NIX_LDFLAGS = "-lSDL_image"; - buildInputs = [ SDL SDL_image libGLU libGL openal libvorbis freealut ]; patchPhase = '' - sed -i -e s,Data/,$out/opt/$name/Data/,g \ - -e s,Data:,$out/opt/$name/Data/,g \ - Source/*.cpp + sed -i -e s,Data/,$out/share/$pname/,g \ + -e s,Data:,$out/share/$pname/,g \ + src/*.cpp ''; installPhase = '' - mkdir -p $out/bin $out/opt/$name - cp objs/blackshades $out/bin - cp -R Data IF* Readme $out/opt/$name/ + mkdir -p $out/bin $out/share/doc/$pname + cp build/blackshades $out/bin + cp -R Data $out/share/$pname + cp README.md $out/share/doc/$pname ''; meta = { - homepage = "http://icculus.org/blackshades/"; - description = "Protect the VIP"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; + homepage = "https://sr.ht/~cnx/blackshades"; + description = "A psychic bodyguard FPS"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ McSinyx viric ]; platforms = with lib.platforms; linux; }; }