diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index b52c9f523d46..d0cc348da0ec 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -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 { }; diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index f818cf689cb1..d556e6838f57 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -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; }; -} +}) diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index a79db9013a5f..c7b13fb5f18d 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -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" ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix index ff4cbf415c9d..b10b8af8b702 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix @@ -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; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix index 5d8964588971..9ced9ed8a86b 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix @@ -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; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix index 08526e81b8ee..955bdfc1eeef 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/royshil/obs-backgroundremoval"; maintainers = with maintainers; [ zahrun ]; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix index 56236261483a..0696634bb95e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/norihiro/command-source"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix b/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix index 2ef998788b40..28804383dc6e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/exeldro/obs-dir-watch-media"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Only; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix index 23a3c3e41d42..c092185b5f90 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix @@ -33,9 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/exeldro/obs-gradient-source"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix index ee34343c275f..e63c3a9e9d29 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hyperion-project/hyperion-obs-plugin"; license = licenses.mit; maintainers = with maintainers; [ algram ]; - platforms = [ "x86_64-linux" ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix index 85089cb35883..4c9ceff91acf 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix @@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec { mit ]; maintainers = [ maintainers.Bauke ]; - platforms = obs-studio.meta.platforms; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix b/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix index c837952e6c2d..51b6c29f99ad 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/exeldro/obs-markdown"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Only; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 1ee0a0615f7b..5c7527f58efc 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/exeldro/obs-move-transition"; maintainers = with maintainers; [ starcraft66 ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix index abd3e2fbe6e5..368325107282 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation rec { description = "Multi-site simultaneous broadcast plugin for OBS Studio"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ jk ]; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix index b235ca6fb20b..c8c480a8bb7b 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/norihiro/obs-mute-filter"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-noise.nix b/pkgs/applications/video/obs-studio/plugins/obs-noise.nix index f893de5f0200..fc481e57c4eb 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-noise.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-noise.nix @@ -30,9 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/FiniteSingularity/obs-noise"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Only; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix deleted file mode 100644 index f1120c7c255e..000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - ninja, - pkg-config, - obs-studio, - libGL, - libX11, -}: - -stdenv.mkDerivation rec { - pname = "obs-nvfbc"; - version = "0.0.7"; - - src = fetchFromGitLab { - owner = "fzwoch"; - repo = "obs-nvfbc"; - rev = "v${version}"; - hash = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo="; - }; - - nativeBuildInputs = [ - meson - pkg-config - ninja - ]; - buildInputs = [ - obs-studio - libGL - libX11 - ]; - - meta = with lib; { - description = "OBS Studio source plugin for NVIDIA FBC API"; - homepage = "https://gitlab.com/fzwoch/obs-nvfbc"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ babbaj ]; - platforms = [ "x86_64-linux" ]; - broken = true; - }; -} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index cef41a7119a4..8c99b8b4bf2d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -42,9 +42,6 @@ stdenv.mkDerivation rec { fazzi ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix b/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix index f953df7d1422..10e92ac5a8bd 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix @@ -31,9 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/FiniteSingularity/obs-retro-effects"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix index a176af8babb7..406e7b65986a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix @@ -25,9 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wimpysworld/obs-rgb-levels"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Only; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix index 9dd74650681e..945e740063f6 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix @@ -30,9 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dimtpap/obs-scale-to-sound"; maintainers = with lib.maintainers; [ flexiondotorg ]; license = lib.licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix index d36b336a727c..f844c0f25499 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/andilippi/obs-scene-as-transition"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index ae4a77d246c8..31236c550e79 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/exeldro/obs-shaderfilter"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix index eda617a1f353..811e43e921e2 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { shackra ]; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix index 9226d488536d..94be04736f23 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix @@ -32,9 +32,6 @@ stdenv.mkDerivation { homepage = "https://github.com/exeldro/obs-source-switcher"; maintainers = with lib.maintainers; [ flexiondotorg ]; license = lib.licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix b/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix index ca46be639993..f68a03f80736 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix @@ -30,9 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/FiniteSingularity/obs-stroke-glow-shadow"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Only; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix index 9efe37ea6d4d..61d203999ebc 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix @@ -42,9 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/norihiro/obs-text-pthread"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix index 097dbe334a83..f1e27d4327de 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix @@ -35,9 +35,6 @@ stdenv.mkDerivation { homepage = "https://github.com/exeldro/obs-transition-table"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix b/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix index 0ced62150e21..e7f6abfbd38e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix @@ -90,9 +90,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/locaal-ai/obs-urlsource"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Only; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index fdbb8bbafe3d..3abc131cab42 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -66,9 +66,6 @@ stdenv.mkDerivation rec { pedrohlc ]; license = lib.licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 2dd87819c346..fffbea3e20d9 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -47,9 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Aitum/obs-vertical-canvas"; maintainers = with lib.maintainers; [ flexiondotorg ]; license = lib.licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix index 9a8967d67df8..9a25cc41b839 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cg2121/obs-vintage-filter"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix index a3198dba06d6..6c67a1d6a3db 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix @@ -42,9 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/obsproject/obs-websocket"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/pixel-art.nix b/pkgs/applications/video/obs-studio/plugins/pixel-art.nix index 95998d6b4500..12e70c21847c 100644 --- a/pkgs/applications/video/obs-studio/plugins/pixel-art.nix +++ b/pkgs/applications/video/obs-studio/plugins/pixel-art.nix @@ -25,9 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dspstanky/pixel-art"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Only; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + inherit (obs-studio.meta) platforms; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix index 1c432de77d5e..5439574f6421 100644 --- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/phandasm/waveform"; maintainers = with lib.maintainers; [ matthewcroughan ]; license = lib.licenses.gpl3; + # Hard coded x86_64 support platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/nd/ndi-6/package.nix b/pkgs/by-name/nd/ndi-6/package.nix index 1e121b7e5764..4e1c0a2109c9 100644 --- a/pkgs/by-name/nd/ndi-6/package.nix +++ b/pkgs/by-name/nd/ndi-6/package.nix @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i" done rm $out/bin/libndi.so.${majorVersion} - ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.${majorVersion} + ln -s $out/lib/libndi.so $out/bin/libndi.so.${majorVersion} # Fake ndi version 5 for compatibility with DistroAV (obs plugin using NDI) - ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.5 + ln -s $out/lib/libndi.so $out/bin/libndi.so.5 mv include examples $out/ mkdir -p $out/share/doc/ndi-6 mv licenses $out/share/doc/ndi-6/licenses diff --git a/pkgs/by-name/nd/ndi-6/version.json b/pkgs/by-name/nd/ndi-6/version.json index 15f6b09389ef..edbc456e9e4a 100644 --- a/pkgs/by-name/nd/ndi-6/version.json +++ b/pkgs/by-name/nd/ndi-6/version.json @@ -1 +1 @@ -{"hash": "sha256-10pxvHLYbQ1p3NKSTC1I3YAFkPbYSCenXTEWukqy5TY=", "version": "6.2.0"} +{"hash": "sha256-C99mJkUn+L43+iLt3SuFFLmGilik2D+AoH2+tHnuFNQ=", "version": "6.2.0"}