Unverified Commit 79d0b86c authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #264683 from Scrumplex/pkgs/qpwgraph/qt6

parents 03e14045 d67e8cc8

pkgs/applications/audio/qpwgraph/default.nix

+17 −8
Original line number Diff line number Diff line 
{ lib, mkDerivation, fetchFromGitLab

, cmake, pkg-config

, alsa-lib, pipewire

{ lib

, stdenv

, fetchFromGitLab

, cmake

, pkg-config

, wrapQtAppsHook

, qtbase

, qtsvg

, qtwayland

, alsa-lib

, pipewire

}:



mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "qpwgraph";

  version = "0.5.3";
@@ -11,13 +19,13 @@ mkDerivation rec { 
    domain = "gitlab.freedesktop.org";

    owner = "rncbc";

    repo = "qpwgraph";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U=";

  };



  nativeBuildInputs = [ cmake pkg-config ];

  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];



  buildInputs = [ alsa-lib pipewire ];

  buildInputs = [ qtbase qtsvg qtwayland alsa-lib pipewire ];



  cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ];
@@ -32,5 +40,6 @@ mkDerivation rec { 
    license = licenses.gpl2Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ kanashimia exi Scrumplex ];

    mainProgram = "qpwgraph";

  };

}
 
})

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -34923,7 +34923,7 @@ with pkgs; 














  qnotero = libsForQt5.callPackage ../applications/office/qnotero { };



























  qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { };













  qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { };





























  qrcode = callPackage ../tools/graphics/qrcode { };