diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 14:53:29 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 14:53:29 +0100 |
| commit | 5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4 (patch) | |
| tree | c59afebc263ebb1693ae8c154164e5625c30ee76 /pkgs/applications/video | |
| parent | 801d3b51f0ed2da1745c87eec8da2035d7dd5fb7 (diff) | |
| parent | f6b39f852e0a9eb35a7434f02e5579c15519c41c (diff) | |
| download | nixlib-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar nixlib-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.gz nixlib-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.bz2 nixlib-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.lz nixlib-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.xz nixlib-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.zst nixlib-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/obs-studio/hardcode-ndi-path.patch | 17 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/obs-ndi.nix | 14 |
2 files changed, 25 insertions, 6 deletions
diff --git a/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch new file mode 100644 index 000000000000..caef96c381f2 --- /dev/null +++ b/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch @@ -0,0 +1,17 @@ +diff --git a/src/obs-ndi.cpp b/src/obs-ndi.cpp +index 493831c..7b0f8db 100644 +--- a/src/obs-ndi.cpp ++++ b/src/obs-ndi.cpp +@@ -197,11 +197,7 @@ const char* obs_module_description() + const NDIlib_v4* load_ndilib() + { + QStringList locations; +- locations << QString(qgetenv(NDILIB_REDIST_FOLDER)); +-#if defined(__linux__) || defined(__APPLE__) +- locations << "/usr/lib"; +- locations << "/usr/local/lib"; +-#endif ++ locations << "@NDI@/lib"; + + for (QString path : locations) { + blog(LOG_INFO, "Trying '%s'", path.toUtf8().constData()); diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index 450ebf4ac20d..452793f442ee 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -2,15 +2,18 @@ # somewhat manually install this: # nix-env -f "<nixpkgs>" -iA obs-ndi -# mkdir -p ~/.config/obs-studio/plugins -# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-ndi ~/.config/obs-studio/plugins/ +# mkdir -p ~/.config/obs-studio/plugins/bin +# ln -s ~/.nix-profile/lib/obs-plugins/obs-ndi.so ~/.config/obs-studio/plugins/bin/ -{ stdenv, fetchFromGitHub, obs-studio, cmake, qt5 }: +{ stdenv, fetchFromGitHub, obs-studio, cmake, qt5, ndi }: stdenv.mkDerivation rec { pname = "obs-ndi"; version = "4.7.1"; + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio qt5.qtbase ndi ]; + src = fetchFromGitHub { owner = "Palakis"; repo = "obs-ndi"; @@ -18,10 +21,9 @@ stdenv.mkDerivation rec { sha256 = "040fkbf3f3qgqcrd3072y3zrjb4fwga8zr10jym744xd7bgyylqh"; }; - patches = [ ./fix-search-path.patch ]; + patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio qt5.qtbase ]; + postPatch = "sed -i -e s,@NDI@,${ndi},g src/obs-ndi.cpp"; cmakeFlags = [ "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" |