Unverified Commit ad9440ea authored by rewine's avatar rewine Committed by GitHub
Browse files

Merge pull request #299628 from FedericoSchonborn/haruna-1.0.2 

haruna: 0.12.3 -> 1.0.2
parents 685b2a4e c7924db7

pkgs/applications/video/haruna/default.nix

+8 −10
Original line number Diff line number Diff line 
{ lib

, fetchFromGitLab

, mkDerivation

, mkKdeDerivation

, breeze-icons

, breeze-qt5

, breeze

, cmake

, extra-cmake-modules

, ffmpeg-headless
@@ -12,7 +12,7 @@ 
, ki18n

, kiconthemes

, kio

, kirigami2

, kirigami

, kxmlgui

, kdoctools

, mpv
@@ -20,19 +20,18 @@ 
, wrapQtAppsHook

, qqc2-desktop-style

, qtbase

, qtquickcontrols2

, yt-dlp

}:



mkDerivation rec {

mkKdeDerivation rec {

  pname = "haruna";

  version = "0.12.3";

  version = "1.0.2";



  src = fetchFromGitLab {

    owner = "multimedia";

    repo = "haruna";

    rev = "v${version}";

    hash = "sha256-iYf8oTMQ65+6E1dlOj0GU6EezPul6p1GG2CcrcjDUik=";

    hash = "sha256-L/mTFPJPHl8A6FqkWUwICh+Yl4uIE5KnTkZVnC4kCZ8=";

    domain = "invent.kde.org";

  };
@@ -43,7 +42,7 @@ mkDerivation rec { 


  buildInputs = [

    breeze-icons

    breeze-qt5

    breeze

    qqc2-desktop-style

    yt-dlp
@@ -54,12 +53,11 @@ mkDerivation rec { 
    ki18n

    kiconthemes

    kio

    kirigami2

    kirigami

    kxmlgui

    kdoctools

    mpv

    qtbase

    qtquickcontrols2

  ];



  nativeBuildInputs = [

pkgs/top-level/all-packages.nix

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














  gspeech = callPackage ../applications/audio/gspeech { };



























  haruna = libsForQt5.callPackage ../applications/video/haruna { };













  haruna = kdePackages.callPackage ../applications/video/haruna { };





























  hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };