libajantv2: init at 16.2-bugfix5

(cherry picked from commit a200133)
NixOS · Oct 6, 2022 · f975db7 · f975db7
1 parent 6426ffa
commit f975db7
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 9 deletions.
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
@@ -1,7 +1,6 @@
 { config
 , lib
 , stdenv
-, mkDerivation
 , fetchFromGitHub
 , addOpenGLRunpath
 , cmake
@@ -13,7 +12,6 @@
 , libpthreadstubs
 , libXdmcp
 , qtbase
-, qtx11extras
 , qtsvg
 , speex
 , libv4l
@@ -41,13 +39,14 @@
 , libajantv2
 , librist
 , srt
+, wrapQtAppsHook
 }:
 
 let
   inherit (lib) optional optionals;
 
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "obs-studio";
   version = "28.0.3";
 
@@ -69,6 +68,7 @@ mkDerivation rec {
     cmake
     pkg-config
     wrapGAppsHook
+    wrapQtAppsHook
   ]
   ++ optional scriptingSupport swig;
 
@@ -84,7 +84,6 @@ mkDerivation rec {
     libpthreadstubs
     libXdmcp
     qtbase
-    qtx11extras
     qtsvg
     speex
     wayland

diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix
@@ -22,16 +22,16 @@ symlinkJoin {
       wrapCommandLine = [
           "wrapProgram"
           "$out/bin/obs"
-          ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"''
-          ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"''
+          ''--set OBS_PLUGINS_PATH "${obs-studio}/lib/obs-plugins"''
+          ''--set OBS_PLUGINS_DATA_PATH "${obs-studio}/share/obs/obs-plugins"''
         ] ++ pluginArguments;
     in ''
     ${concatStringsSep " " wrapCommandLine}
 
     # Remove unused obs-plugins dir to not cause confusion
-    rm -r $out/share/obs/obs-plugins
+    # rm -r $out/share/obs/obs-plugins
     # Leave some breadcrumbs
-    echo 'Plugins are at ${pluginsJoined}/share/obs/obs-plugins' > $out/share/obs/obs-plugins-README
+    # echo 'Plugins are at ${pluginsJoined}/share/obs/obs-plugins' > $out/share/obs/obs-plugins-README
   '';
 
   inherit (obs-studio) meta;

diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/development/libraries/libajantv2/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, ninja
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libajantv2";
+  version = "16.2-bugfix5";
+
+  src = fetchFromGitHub {
+    owner = "aja-video";
+    repo = "ntv2";
+    rev = "v${version}";
+    sha256 = "sha256-h5PKWMwqTeI5/EaTWkjYojuvDU0FyMpzIjWB98UOJwc=";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  meta = with lib; {
+    description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against";
+    homepage = "https://github.com/aja-video/ntv2";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ sebtm ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -24604,6 +24604,8 @@ with pkgs;
 
   libaio = callPackage ../os-specific/linux/libaio { };
 
+  libajantv2 = callPackage ../development/libraries/libajantv2 {};
+
   libargon2 = callPackage ../development/libraries/libargon2 { };
 
   libatasmart = callPackage ../os-specific/linux/libatasmart { };
@@ -30418,7 +30420,7 @@ with pkgs;
 
   gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { };
 
-  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
+  obs-studio = qt6Packages.callPackage ../applications/video/obs-studio {
     ffmpeg_4 = ffmpeg-full;
   };
   obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});