public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mediastreamer: introduce environment variable to set plugins directory

Browse Source
This commit is contained in:
Thomas Strobel 2015-08-26 22:15:31 +02:00
parent 444b8484d7
commit dbd3584590
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/mediastreamer/default.nix
View File

@ -11,11 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc"; sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc";
}; };
patches = [ ./plugins_dir.patch ];
postPatch = '' postPatch = ''
sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure
''; '';
# TODO: make it load plugins from *_PLUGIN_PATH
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-external-ortp" "--enable-external-ortp"
"--with-srtp=${srtp}" "--with-srtp=${srtp}"
"--enable-xv"
"--enable-glx"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

24
pkgs/development/libraries/mediastreamer/plugins_dir.patch Normal file
View File

@ -0,0 +1,24 @@
diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c
--- a/src/base/msfactory.c 2015-05-13 16:53:49.801113249 +0200
+++ b/src/base/msfactory.c 2015-08-26 21:35:44.994724647 +0200
@@ -630,12 +630,18 @@
}
void ms_factory_init_plugins(MSFactory *obj) {
+ char *package_plugins_dir;
if (obj->plugins_dir == NULL) {
+ package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR");
+ if (package_plugins_dir!=NULL){
+ obj->plugins_dir = ms_strdup(package_plugins_dir);
+ } else {
#ifdef PACKAGE_PLUGINS_DIR
- obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
+ obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
#else
- obj->plugins_dir = ms_strdup("");
+ obj->plugins_dir = ms_strdup("");
#endif
+ }
}
if (strlen(obj->plugins_dir) > 0) {
ms_message("Loading ms plugins from [%s]",obj->plugins_dir);