From c0aaa9a2eb0bbc466b5b916738fbd80e8f3378fe Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 10 Nov 2024 21:49:05 +0100 Subject: [PATCH] projectm: move to projectm_3 ProjectM 4 was split into libprojectm and projectm-sdl --- pkgs/applications/audio/clementine/default.nix | 4 ++-- pkgs/applications/audio/{projectm => projectm_3}/default.nix | 0 .../video/kodi/addons/visualization-projectm/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/applications/audio/{projectm => projectm_3}/default.nix (100%) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 2422511f1275..9ffdd2ebb204 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -24,7 +24,7 @@ gvfs, libcdio, pcre, - projectm, + projectm_3, protobuf, qca-qt5, pkg-config, @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { liblastfm libpulseaudio pcre - projectm + projectm_3 protobuf qca-qt5 qjson diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm_3/default.nix similarity index 100% rename from pkgs/applications/audio/projectm/default.nix rename to pkgs/applications/audio/projectm_3/default.nix diff --git a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix index bd103adb090c..03a838dcc1b5 100644 --- a/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix +++ b/pkgs/applications/video/kodi/addons/visualization-projectm/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL, projectm }: +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL, projectm_3 }: buildKodiBinaryAddon rec { pname = "visualization-projectm"; @@ -12,7 +12,7 @@ buildKodiBinaryAddon rec { hash = "sha256-J3RtVl+hO8DspLyF2KAVMLDIJBiEb0bKosKhJyKy9hk="; }; - extraBuildInputs = [ pkg-config libGL projectm ]; + extraBuildInputs = [ pkg-config libGL projectm_3 ]; propagatedBuildInputs = [ glm ]; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 76be3c4173d4..130bf016d017 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1182,6 +1182,7 @@ mapAliases { poac = cabinpkg; # Added 2025-01-22 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 + projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10 # postgresql plugins cstore_fdw = postgresqlPackages.cstore_fdw; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b21c52cddd7f..8588c147b936 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4692,7 +4692,7 @@ with pkgs; jdk = jdk8; }; - projectm = libsForQt5.callPackage ../applications/audio/projectm { }; + projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { }; proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;