diff options
| author | kirillrdy <kirillrdy@gmail.com> | 2024-04-13 20:09:55 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 20:09:55 +1000 |
| commit | 46e0c9707e5b8246ab1c7b515d5088a5d00aec6c (patch) | |
| tree | 1bfad54b93f3356b3b6f3bf310287dab501d0487 /pkgs/applications | |
| parent | 3860566c6fd043b2a3b6a1ad86c608c76f0c9e55 (diff) | |
| parent | 96eb78b80ccb9f6bda7aebee58017638d757218b (diff) | |
Merge pull request #303775 from 3JlOy-PYCCKUi/anilibria-winmaclinux
anilibria-winmaclinux: 1.2.15 -> 1.2.16.1
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch | 28 | ||||
| -rw-r--r-- | pkgs/applications/video/anilibria-winmaclinux/default.nix | 17 |
2 files changed, 11 insertions, 34 deletions
diff --git a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch deleted file mode 100644 index 6bdfcf2c2d2a4..0000000000000 --- a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index d35947be850b1..522c37f3a625f 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -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 { |