From 72fc0b165adba16e6cceda5b20361eb011edd216 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 04:03:49 +0100 Subject: [PATCH 1/3] performous: move to pkgs/by-name --- .../default.nix => by-name/pe/performous/package.nix} | 0 pkgs/{games => by-name/pe}/performous/performous-cmake.patch | 0 pkgs/{games => by-name/pe}/performous/performous-fftw.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{games/performous/default.nix => by-name/pe/performous/package.nix} (100%) rename pkgs/{games => by-name/pe}/performous/performous-cmake.patch (100%) rename pkgs/{games => by-name/pe}/performous/performous-fftw.patch (100%) diff --git a/pkgs/games/performous/default.nix b/pkgs/by-name/pe/performous/package.nix similarity index 100% rename from pkgs/games/performous/default.nix rename to pkgs/by-name/pe/performous/package.nix 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 8cc0cbc90f96..74353267352d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34721,8 +34721,6 @@ with pkgs; pentobi = libsForQt5.callPackage ../games/pentobi { }; - performous = callPackage ../games/performous { }; - pinball = callPackage ../games/pinball { }; pingus = callPackage ../games/pingus { }; From d74b818ad0310c763bc6e30532e8f80ebbf9dd33 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 04:04:20 +0100 Subject: [PATCH 2/3] performous: reformat --- pkgs/by-name/pe/performous/package.nix | 43 +++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix index 20a40922544e..50d33f01d867 100644 --- a/pkgs/by-name/pe/performous/package.nix +++ b/pkgs/by-name/pe/performous/package.nix @@ -1,24 +1,25 @@ -{ 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, + SDL2, + aubio, + boost, + cmake, + ffmpeg, + fmt, + gettext, + glew, + glibmm, + glm, + icu, + libepoxy, + librsvg, + libxmlxx, + nlohmann_json, + pango, + pkg-config, + portaudio, }: stdenv.mkDerivation rec { From c357e610d995d1042f12a840cdac97c99d80cad6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 04:05:47 +0100 Subject: [PATCH 3/3] performous: fix build with ffmpeg 7 --- pkgs/by-name/pe/performous/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix index 50d33f01d867..f1082473cf98 100644 --- a/pkgs/by-name/pe/performous/package.nix +++ b/pkgs/by-name/pe/performous/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, SDL2, aubio, boost, @@ -43,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 = ''