diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch | |
parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch new file mode 100644 index 000000000000..e64bfc5a43a1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/plugins_dir.patch @@ -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); |