mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 04:57:56 +03:00
Merge pull request #261746 from 3JlOy-PYCCKUi/anilibria-winmaclinux
anilibria-winmaclinux: build with libvlc
This commit is contained in:
commit
8dc748ddd0
@ -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
|
@ -10,6 +10,7 @@
|
|||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
|
, libvlc
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
@ -30,11 +31,13 @@ mkDerivation rec {
|
|||||||
patches = [
|
patches = [
|
||||||
./0001-fix-installation-paths.patch
|
./0001-fix-installation-paths.patch
|
||||||
./0002-disable-version-check.patch
|
./0002-disable-version-check.patch
|
||||||
|
./0003-build-with-vlc.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
substituteInPlace AniLibria.pro \
|
substituteInPlace AniLibria.pro \
|
||||||
--replace "\$\$PREFIX" '${placeholder "out"}'
|
--replace "\$\$PREFIX" '${placeholder "out"}' \
|
||||||
|
--replace '@VLC_PATH@' '${libvlc}/include'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
qtWrapperArgs = [
|
qtWrapperArgs = [
|
||||||
@ -58,6 +61,7 @@ mkDerivation rec {
|
|||||||
qtquickcontrols2
|
qtquickcontrols2
|
||||||
qtwebsockets
|
qtwebsockets
|
||||||
qtmultimedia
|
qtmultimedia
|
||||||
|
libvlc
|
||||||
] ++ (with gst_all_1; [
|
] ++ (with gst_all_1; [
|
||||||
gst-plugins-bad
|
gst-plugins-bad
|
||||||
gst-plugins-good
|
gst-plugins-good
|
||||||
|
Loading…
Reference in New Issue
Block a user