Merge pull request #262381 from makefu/pkgs/ps3netsrv/replace-upstream

ps3netsrv: replace with webman mod fork

authored by Lassulus and committed by GitHub 448f34e9 95ee3e83

+25 -20
+2
nixos/doc/manual/release-notes/rl-2311.section.md
··· 323 323 324 324 - `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name. 325 325 326 + - `ps3netsrv` has been replaced with the webman-mod fork, the executable has been renamed from `ps3netsrv++` to `ps3netsrv` and cli parameters have changed. 327 + 326 328 ## Other Notable Changes {#sec-release-23.11-notable-changes} 327 329 328 330 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
+23 -20
pkgs/servers/ps3netsrv/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub }: 2 - 3 - stdenv.mkDerivation { 1 + { lib, stdenv, fetchzip, mbedtls, meson, ninja, fetchFromGitHub }: 2 + let 3 + webManModVersion = "1.47.42"; 4 + in 5 + stdenv.mkDerivation rec { 4 6 pname = "ps3netsrv"; 5 - version = "1.1.0"; 7 + version = "20220813"; 6 8 7 - enableParallelBuilding = true; 9 + src = fetchzip { 10 + url = "https://github.com/aldostools/webMAN-MOD/releases/download/${webManModVersion}/${pname}_${version}.zip"; 11 + hash = "sha256-ynFuCD+tp8E/DDdB/HU9BCmwKcmQy6NBx26MKnP4W0o="; 12 + }; 8 13 9 - src = fetchFromGitHub { 10 - owner = "dirkvdb"; 11 - repo = "ps3netsrv--"; 12 - rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; 13 - sha256 = "sha256-SpPyRhPwOhTONAYH/eqLGmVl2XzhA1r1nUwKj7+rGyY="; 14 - fetchSubmodules = true; 15 - }; 14 + sourceRoot = "./source/${pname}"; 15 + 16 + buildInputs = [ 17 + meson 18 + ninja 19 + mbedtls 20 + ]; 16 21 17 - buildPhase = "make CXX=$CXX"; 18 - installPhase = '' 19 - mkdir -p $out/bin 20 - cp ps3netsrv++ $out/bin 22 + postInstall = '' 23 + install -Dm644 ../LICENSE.TXT $out/usr/share/licenses/${pname}/LICENSE.TXT 21 24 ''; 22 25 23 26 meta = { 24 - description = "C++ implementation of the ps3netsrv server"; 25 - homepage = "https://github.com/dirkvdb/ps3netsrv--"; 26 - license = lib.licenses.mit; 27 + description = "PS3 Net Server (mod by aldostools)"; 28 + homepage = "https://github.com/aldostools/webMAN-MOD/"; 29 + license = lib.licenses.gpl3; 27 30 platforms = lib.platforms.unix; 28 31 maintainers = with lib.maintainers; [ makefu ]; 29 - mainProgram = "ps3netsrv++"; 32 + mainProgram = "ps3netsrv"; 30 33 }; 31 34 }