Unverified Commit f50c71c7 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

obs-studio-plugins: inherit platforms from obs-studio.meta (#441672)

parents 1543ecff 5a2d3d44

pkgs/applications/video/obs-studio/plugins/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ 


  obs-noise = callPackage ./obs-noise.nix { };



  obs-nvfbc = callPackage ./obs-nvfbc.nix { };



  obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };



  obs-recursion-effect = callPackage ./obs-recursion-effect.nix { };

pkgs/applications/video/obs-studio/plugins/input-overlay.nix

+7 −7
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchFromGitHub,

  cmake,

  pkg-config,

  ninja,

  obs-studio,

  libuiohook,

  qtbase,
@@ -13,14 +14,14 @@ 
  SDL2,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "obs-input-overlay";

  version = "5.0.6";



  src = fetchFromGitHub {

    owner = "univrsal";

    repo = "input-overlay";

    rev = "refs/tags/${version}";

    tag = finalAttrs.version;

    hash = "sha256-ju4u7hhx+hTuq7Oh0DBPV8RRM8zqyyvYV74KymU0+2c=";

    fetchSubmodules = true;

  };
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    cmake

    pkg-config

    ninja

  ];



  buildInputs = [
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec { 
    libxkbfile

  ];



  cmakeFlags = [

  cmakeFlags = lib.optionals stdenv.hostPlatform.isx86 [

    "-DCMAKE_CXX_FLAGS=-msse4.1"

  ];
@@ -62,8 +64,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/univrsal/input-overlay";

    maintainers = with lib.maintainers; [ glittershark ];

    license = lib.licenses.gpl2;

    platforms = lib.platforms.linux;

    # never built on aarch64-linux since first introduction in nixpkgs

    broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;

    inherit (obs-studio.meta) platforms;

  };

}
 
})

pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ stdenv.mkDerivation { 
    homepage = "https://looking-glass.io/docs/stable/obs/";

    license = licenses.gpl2Plus;

    maintainers = with maintainers; [ babbaj ];

    # Hard coded x86_64 support

    platforms = [ "x86_64-linux" ];

  };

}

pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix

+1 −4
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/exeldro/obs-3d-effect";

    maintainers = with maintainers; [ flexiondotorg ];

    license = licenses.gpl2Plus;

    platforms = [

      "x86_64-linux"

      "i686-linux"

    ];

    inherit (obs-studio.meta) platforms;

  };

}

pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix

+1 −4
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://github.com/Aitum/obs-aitum-multistream";

    maintainers = with lib.maintainers; [ flexiondotorg ];

    license = lib.licenses.gpl2Plus;

    platforms = [

      "x86_64-linux"

      "i686-linux"

    ];

    inherit (obs-studio.meta) platforms;

  };

}