Unverified Commit 0ada8169 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents a7fa9e4e 8fc819a6

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -2471,6 +2471,12 @@ 
      fingerprint = "4EBB 30F1 E89A 541A A7F2  52BE 830A 9728 6309 66F4";

    }];

  };

  christophcharles = {

    email = "23055925+christophcharles@users.noreply.github.com";

    github = "christophcharles";

    githubId = 23055925;

    name = "Christoph Charles";

  };

  christopherpoole = {

    email = "mail@christopherpoole.net";

    github = "christopherpoole";

pkgs/applications/audio/pianobooster/default.nix

+48 −8
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools

, alsa-lib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook

{ lib

, stdenv

, fetchFromGitHub

, cmake

, pkg-config

, qttools

, alsa-lib

, ftgl

, libGLU

, qtbase

, rtmidi

, libjack2

, fluidsynth

, soundfont-fluid

, unzip

, wrapQtAppsHook

}:



stdenv.mkDerivation rec {

  pname = "pianobooster";

  version = "0.7.2b";

  version = "1.0.0";



  src = fetchFromGitHub {

    owner = "captnfab";

    owner = "pianobooster";

    repo = "PianoBooster";

    rev = "v${version}";

    sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj";

    hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA=";

  };



  nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];

  postPatch = ''

    substituteInPlace src/Settings.cpp src/GuiMidiSetupDialog.cpp \

      --replace "/usr/share/soundfonts" "${soundfont-fluid}/share/soundfonts" \

      --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2"

  '';



  buildInputs = [ alsa-lib ftgl libGLU libjack2 qtbase rtmidi ];

  nativeBuildInputs = [

    cmake

    pkg-config

    qttools

    wrapQtAppsHook

  ];



  buildInputs = [

    alsa-lib

    ftgl

    libGLU

    qtbase

    rtmidi

    libjack2

    fluidsynth

  ];



  cmakeFlags = [

    "-DOpenGL_GL_PREFERENCE=GLVND"

    "-DUSE_JACK=ON"

  ];



  postInstall = ''

    qtWrapperArgs+=(

      --prefix PATH : "${lib.makeBinPath [ unzip ]}"

    )

  '';



  meta = with lib; {

    description = "A MIDI file player that teaches you how to play the piano";

    homepage = "https://github.com/captnfab/PianoBooster";

    homepage = "https://github.com/pianobooster/PianoBooster";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ goibhniu orivej ];

pkgs/applications/backup/timeshift/unwrapped.nix

+1 −1
Original line number Diff line number Diff line
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/linuxmint/timeshift";

    license = licenses.gpl3;

    platforms = platforms.linux;

    maintainers = with maintainers; [ ShamrockLee ];

    maintainers = with maintainers; [ ShamrockLee bobby285271 ];

  };

}

pkgs/applications/display-managers/lightdm-slick-greeter/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec { 
    description = "A slick-looking LightDM greeter";

    homepage = "https://github.com/linuxmint/slick-greeter";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ water-sucks ];

    maintainers = with maintainers; [ water-sucks bobby285271 ];

    platforms = platforms.linux;

  };

}

pkgs/applications/editors/xed-editor/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/linuxmint/xed";

    license = licenses.gpl2Only;

    platforms = platforms.linux;

    maintainers = with maintainers; [ tu-maurice ];

    maintainers = with maintainers; [ tu-maurice bobby285271 ];

  };

}