diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2023-10-28 17:07:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-28 17:07:04 +0200 |
| commit | 8dc748ddd00de5062f3db92466b74d270c2d2ab2 (patch) | |
| tree | da7a59b19697d89ced5c5a9fff14f5de2f0eb9e7 /pkgs/applications/video/anilibria-winmaclinux | |
| parent | 97da6c943d33a75d06d9e7f1e5f922bc44e667ab (diff) | |
| parent | 0917aa4657eed29c30bb6098cfae5cc8e501f7ce (diff) | |
Merge pull request #261746 from 3JlOy-PYCCKUi/anilibria-winmaclinux
anilibria-winmaclinux: build with libvlc
Diffstat (limited to 'pkgs/applications/video/anilibria-winmaclinux')
| -rw-r--r-- | pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch | 28 | ||||
| -rw-r--r-- | pkgs/applications/video/anilibria-winmaclinux/default.nix | 6 |
2 files changed, 33 insertions, 1 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 new file mode 100644 index 0000000000000..6bdfcf2c2d2a4 --- /dev/null +++ b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch @@ -0,0 +1,28 @@ +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 f1977ebf7484f..4b5102f25c276 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -10,6 +10,7 @@ , wrapQtAppsHook , makeDesktopItem , copyDesktopItems +, libvlc }: mkDerivation rec { @@ -30,11 +31,13 @@ mkDerivation rec { patches = [ ./0001-fix-installation-paths.patch ./0002-disable-version-check.patch + ./0003-build-with-vlc.patch ]; preConfigure = '' substituteInPlace AniLibria.pro \ - --replace "\$\$PREFIX" '${placeholder "out"}' + --replace "\$\$PREFIX" '${placeholder "out"}' \ + --replace '@VLC_PATH@' '${libvlc}/include' ''; qtWrapperArgs = [ @@ -58,6 +61,7 @@ mkDerivation rec { qtquickcontrols2 qtwebsockets qtmultimedia + libvlc ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-good |