diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 205a3ad287e..57d27ee272c 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -1,57 +1,63 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake -, glew, ftgl, ttf_bitstream_vera -, withQt ? true, qt4 -, withLibvisual ? false, libvisual, SDL -, withJack ? false, libjack2 -, withPulseAudio ? true, libpulseaudio +{ mkDerivation +, lib +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, SDL2 +, qtdeclarative +, libpulseaudio +, glm +, which }: -assert withJack -> withQt; -assert withPulseAudio -> withQt; +mkDerivation rec { + pname = "projectm"; + version = "3.1.3"; -stdenv.mkDerivation { - name = "projectm-2.1.0"; - - meta = { - description = "Music Visualizer"; - homepage = "http://projectm.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + src = fetchFromGitHub { + owner = "projectM-visualizer"; + repo = "projectM"; + rev = "v${version}"; + sha256 = "1mjnahr694phksmvc069y89rv85s4l2z9fixkc3l1f5qj2vgn4sy"; }; - src = fetchurl { - url = "mirror://sourceforge/projectm/2.1.0/projectM-complete-2.1.0-Source.tar.gz"; - sha256 = "1vh6jk68a0jdb6qwppb6f8cbgmhnv2ba3bcavzfd6sq06gq08cji"; - }; - - patch_gcc6 = fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch"; - sha256 = "1i50scxv1jlqvb3jm3sql89a7wqckxhlpvnhz20vvmm1kii6lrsn"; - }; - - patchPhase = '' - patch -d src/libprojectM -p1 -i "$patch_gcc6" - sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \ - src/projectM-libvisual/CMakeLists.txt - ''; - - nativeBuildInputs = [ pkgconfig cmake ]; - - cmakeFlags = [ - "-DprojectM_FONT_MENU=${ttf_bitstream_vera}/share/fonts/truetype/VeraMono.ttf" - "-DprojectM_FONT_TITLE=${ttf_bitstream_vera}/share/fonts/truetype/Vera.ttf" - "-DINCLUDE-PROJECTM-TEST=OFF" - "-DINCLUDE-PROJECTM-QT=${if withQt then "ON" else "OFF"}" - "-DINCLUDE-PROJECTM-LIBVISUAL=${if withLibvisual then "ON" else "OFF"}" - "-DINCLUDE-PROJECTM-JACK=${if withJack then "ON" else "OFF"}" - "-DINCLUDE-PROJECTM-PULSEAUDIO=${if withPulseAudio then "ON" else "OFF"}" + nativeBuildInputs = [ + pkgconfig + autoreconfHook + which ]; - buildInputs = with stdenv.lib; - [ glew ftgl ] - ++ optional withQt qt4 - ++ optionals withLibvisual [ libvisual SDL ] - ++ optional withJack libjack2 - ++ optional withPulseAudio libpulseaudio - ; + buildInputs = [ + SDL2 + qtdeclarative + libpulseaudio + glm + ]; + + configureFlags = [ + "--enable-qt" + "--enable-sdl" + ]; + + fixupPhase = '' + # NOTE: 2019-10-05: Upstream inserts the src path buring build into ELF rpath, so must delete it out + # upstream report: https://github.com/projectM-visualizer/projectm/issues/245 + for entry in $out/bin/* ; do + patchelf --set-rpath "$(patchelf --print-rpath $entry | tr ':' '\n' | grep -v 'src/libprojectM' | tr '\n' ':')" "$entry" + done + wrapQtApp $out/bin/projectM-pulseaudio + rm $out/bin/projectM-unittest + ''; + + meta = { + homepage = "https://github.com/projectM-visualizer/projectm"; + description = "Cross-platform Milkdrop-compatible music visualizer"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ajs124 ]; + longDescription = '' + The open-source project that reimplements the esteemed Winamp Milkdrop by Geiss in a more modern, cross-platform reusable library. + Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations. + ''; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8777785bff8..d71d1c911c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6093,7 +6093,7 @@ in projectlibre = callPackage ../applications/misc/projectlibre { }; - projectm = callPackage ../applications/audio/projectm { }; + projectm = libsForQt5.callPackage ../applications/audio/projectm { }; proot = callPackage ../tools/system/proot { };