diff --git a/pkgs/games/performous/default.nix b/pkgs/by-name/pe/performous/package.nix similarity index 69% rename from pkgs/games/performous/default.nix rename to pkgs/by-name/pe/performous/package.nix index 20a40922544e..f1082473cf98 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/by-name/pe/performous/package.nix @@ -1,24 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, aubio -, boost -, cmake -, ffmpeg -, fmt -, gettext -, glew -, glibmm -, glm -, icu -, libepoxy -, librsvg -, libxmlxx -, nlohmann_json -, pango -, pkg-config -, portaudio +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + SDL2, + aubio, + boost, + cmake, + ffmpeg, + fmt, + gettext, + glew, + glibmm, + glm, + icu, + libepoxy, + librsvg, + libxmlxx, + nlohmann_json, + pango, + pkg-config, + portaudio, }: stdenv.mkDerivation rec { @@ -42,6 +44,12 @@ stdenv.mkDerivation rec { patches = [ ./performous-cmake.patch ./performous-fftw.patch + (fetchpatch { + name = "performous-ffmpeg.patch"; + url = "https://github.com/performous/performous/commit/f26c27bf74b85fa3e3b150682ab9ecf9aecb3c50.patch"; + excludes = [ ".github/workflows/macos.yml" ]; + hash = "sha256-cQVelET/g2Kx2PlV3pspjEoNIwwn5Yz6enYl5vCMMKo="; + }) ]; postPatch = '' diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/by-name/pe/performous/performous-cmake.patch similarity index 100% rename from pkgs/games/performous/performous-cmake.patch rename to pkgs/by-name/pe/performous/performous-cmake.patch diff --git a/pkgs/games/performous/performous-fftw.patch b/pkgs/by-name/pe/performous/performous-fftw.patch similarity index 100% rename from pkgs/games/performous/performous-fftw.patch rename to pkgs/by-name/pe/performous/performous-fftw.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87b3ffa672b6..c81b5b119005 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34677,8 +34677,6 @@ with pkgs; pentobi = libsForQt5.callPackage ../games/pentobi { }; - performous = callPackage ../games/performous { }; - pinball = callPackage ../games/pinball { }; pingus = callPackage ../games/pingus { };