Unverified Commit 46e0c970 authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

Merge pull request #303775 from 3JlOy-PYCCKUi/anilibria-winmaclinux 

anilibria-winmaclinux: 1.2.15 -> 1.2.16.1
parents 3860566c 96eb78b8

pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
diff --git a/AniLibria.pro b/AniLibria.pro

index 407dbde..ae69502 100644

--- a/AniLibria.pro

+++ b/AniLibria.pro

@@ -21,17 +21,17 @@ windows {

     DEFINES += NO_NEED_STANDART_PLAYER

 }

 

-#unix {

-#    LIBS += -lvlc

+unix {

+    LIBS += -lvlc

 

 #    INCLUDEPATH += /usr/include/

 #    DEPENDPATH += /usr/include/

 

-#    INCLUDEPATH += /usr/include/vlc/plugins

-#    DEPENDPATH += /usr/include/vlc/plugins

+    INCLUDEPATH += @VLC_PATH@/vlc/plugins

+    DEPENDPATH += @VLC_PATH@/vlc/plugins

 

-#    CONFIG += buildwithvlc

-#}

+    CONFIG += buildwithvlc

+}

 

 buildwithvlc {

     DEFINES += USE_VLC_PLAYER

pkgs/applications/video/anilibria-winmaclinux/default.nix

+11 −6
Original line number Diff line number Diff line
@@ -11,23 +11,27 @@ 
, wrapQtAppsHook

, makeDesktopItem

, copyDesktopItems

, libvlc



, withVLC ? true , libvlc

, withMPV ? true , mpv-unwrapped

}:



mkDerivation rec {

  pname = "anilibria-winmaclinux";

  version = "1.2.15";

  version = "1.2.16.1";



  src = fetchFromGitHub {

    owner = "anilibria";

    repo = "anilibria-winmaclinux";

    rev = version;

    sha256 = "sha256-pfM3o4H3XJ4ZE0FXVR1k8pc7lr7SOQjKEMWuG9YkvvI=";

    hash = "sha256-QQliz/tLeYsWgh/ZAO7FfbApAEqWhWoaQe9030QZxA8=";

  };



  sourceRoot = "${src.name}/src";



  qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ];

  qmakeFlags = [ "PREFIX=${placeholder "out"}" ]

    ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ]

    ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ];



  patches = [

    ./0001-fix-installation-paths.patch
@@ -61,14 +65,15 @@ mkDerivation rec { 
    qtquickcontrols2

    qtwebsockets

    qtmultimedia

    libvlc

  ] ++ (with gst_all_1; [

    gst-plugins-bad

    gst-plugins-good

    gst-plugins-base

    gst-libav

    gstreamer

  ]);

  ])

  ++ lib.optionals withVLC [ libvlc ]

  ++ lib.optionals withMPV [ mpv-unwrapped.dev ];



  desktopItems = [

    (makeDesktopItem (rec {