commit fcebf19a4bd092beb39d16b1ec16a3016e7fb601 · pyrox.dev/nixpkgs

-33

pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch

···

       1
       1
       -
       From 0de0a90f8fe5e1e48fa4ec7aa7c825ef88770f9d Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Ryan Foster <RytoEX@gmail.com>

     

       3
       3
       -
       Date: Mon, 9 Sep 2019 23:55:02 -0400

     

       4
       4
       -
       Subject: [PATCH] Enable file access and universal access for file URLs

     

       5
       5
       -
       

     

       6
       6
       -
       When loading a local file, instead of disabling CEF's web security,

     

       7
       7
       -
       enable file access and universal access for file URLs. This should allow

     

       8
       8
       -
       local files to make CORS requests without completely disabling CEF's

     

       9
       9
       -
       security model.

     

       10
       10
       -
       ---

     

       11
       11
       -
        obs-browser-source.cpp | 9 ++++++---

     

       12
       12
       -
        1 file changed, 6 insertions(+), 3 deletions(-)

     

       13
       13
       -
       

     

       14
       14
       -
       diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp

     

       15
       15
       -
       index 09b3017..1094340 100644

     

       16
       16
       -
       --- a/plugins/obs-browser/obs-browser-source.cpp

     

       17
       17
       -
       +++ b/plugins/obs-browser/obs-browser-source.cpp

     

       18
       18
       -
       @@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser()

     

       19
       19
       -
        

     

       20
       20
       -
        #if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430

     

       21
       21
       -
        		if (is_local) {

     

       22
       22
       -
       -			/* Disable web security for file:// URLs to allow

     

       23
       23
       -
       -			 * local content access to remote APIs */

     

       24
       24
       -
       -			cefBrowserSettings.web_security = STATE_DISABLED;

     

       25
       25
       -
       +			/* Enable file access and universal access from file://

     

       26
       26
       -
       +			 * URLs to allow local content access to remote APIs */

     

       27
       27
       -
       +			cefBrowserSettings.file_access_from_file_urls =

     

       28
       28
       -
       +				STATE_ENABLED;

     

       29
       29
       -
       +			cefBrowserSettings.universal_access_from_file_urls =

     

       30
       30
       -
       +				STATE_ENABLED;

     

       31
       31
       -
        		}

     

       32
       32
       -
        #endif

     

       33
       33
       -
        		auto browser = CefBrowserHost::CreateBrowserSync(

+5 -4

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

···

       59
       59
        
         libdatachannel,

     

       60
       60
        
         libvpl,

     

       61
       61
        
         qrcodegencpp,

     

       62
       62
       +
         simde,

     

       62
       63
        
         nix-update-script,

     

       63
       64
        
         extra-cmake-modules,

     

       64
       65
        
       }:

     
···

       82
       83
        
       in

     

       83
       84
        
       stdenv.mkDerivation (finalAttrs: {

     

       84
       85
        
         pname = "obs-studio";

     

       85
       85
       -
         version = "31.1.2";

     

       86
       86
       +
         version = "32.0.1";

     

       86
       87
        
       

     

       87
       88
        
         src = fetchFromGitHub {

     

       88
       89
        
           owner = "obsproject";

     

       89
       90
        
           repo = "obs-studio";

     

       90
       91
        
           rev = finalAttrs.version;

     

       91
       91
       -
           hash = "sha256-QZoIyjliVruDPZj8hzTABaDn+nCTVs5qQCdBLtSOKvI=";

     

       92
       92
       +
           hash = "sha256-99VAVV3hEMDI2R30OrX/in/9KtesUxMGOPg6yT5e4oM=";

     

       92
       93
        
           fetchSubmodules = true;

     

       93
       94
        
         };

     

       94
       95
        
       

     

       95
       96
        
         separateDebugInfo = true;

     

       96
       97
        
       

     

       97
       98
        
         patches = [

     

       98
       98
       -
           # Lets obs-browser build against CEF 90.1.0+

     

       99
       99
       -
           ./Enable-file-access-and-universal-access-for-file-URL.patch

     

       100
       99
        
           ./fix-nix-plugin-path.patch

     

       101
       100
        
         ];

     

       102
       101
        
       

     
···

       155
       154
        
         ]

     

       156
       155
        
         ++ optional browserSupport cef

     

       157
       156
        
         ++ optional withFdk fdk_aac;

     

       157
       157
       +
       

     

       158
       158
       +
         propagatedBuildInputs = [ simde ];

     

       158
       159
        
       

     

       159
       160
        
         # Copied from the obs-linuxbrowser

     

       160
       161
        
         postUnpack = lib.optionalString browserSupport ''

-4

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

···

       60
       60
        
       

     

       61
       61
        
         obs-mute-filter = callPackage ./obs-mute-filter.nix { };

     

       62
       62
        
       

     

       63
       63
       -
         obs-ndi = qt6Packages.callPackage ./obs-ndi { };

     

       64
       64
       -
       

     

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

     

       66
       64
        
       

     

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

     
···

       95
       93
        
         obs-transition-table = qt6Packages.callPackage ./obs-transition-table.nix { };

     

       96
       94
        
       

     

       97
       95
        
         obs-tuna = qt6Packages.callPackage ./obs-tuna { };

     

       98
       98
       -
       

     

       99
       99
       -
         obs-urlsource = qt6Packages.callPackage ./obs-urlsource.nix { };

     

       100
       96
        
       

     

       101
       97
        
         obs-vaapi = callPackage ./obs-vaapi { };

     

       102
       98

+10 -7

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

···

       6
       6
        
         pkg-config,

     

       7
       7
        
         ninja,

     

       8
       8
        
         obs-studio,

     

       9
       9
       -
         libuiohook,

     

       10
       9
        
         qtbase,

     

       11
       10
        
         xorg,

     

       12
       11
        
         libxkbcommon,

     

       13
       12
        
         libxkbfile,

     

       14
       14
       -
         SDL2,

     

       13
       13
       +
         sdl3,

     

       15
       14
        
       }:

     

       16
       15
        
       

     

       17
       16
        
       stdenv.mkDerivation (finalAttrs: {

     

       18
       17
        
         pname = "obs-input-overlay";

     

       19
       19
       -
         version = "5.0.6";

     

       18
       18
       +
         version = "5.1.0-unstable-2025-09-23";

     

       20
       19
        
       

     

       21
       20
        
         src = fetchFromGitHub {

     

       22
       21
        
           owner = "univrsal";

     

       23
       22
        
           repo = "input-overlay";

     

       24
       24
       -
           tag = finalAttrs.version;

     

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

     

       23
       23
       +
           rev = "4d62e7d0c55f8ff62c3a0e7b1a8f3092086b23b7";

     

       24
       24
       +
           hash = "sha256-cUULaOoV4fffEvsHkcG3lnFCIHSvnv3LHg+SDuuVLao=";

     

       26
       25
        
           fetchSubmodules = true;

     

       27
       26
        
         };

     

       28
       27
        
       

     
···

       34
       33
        
       

     

       35
       34
        
         buildInputs = [

     

       36
       35
        
           obs-studio

     

       37
       37
       -
           libuiohook

     

       38
       36
        
           qtbase

     

       39
       39
       -
           SDL2

     

       37
       37
       +
           sdl3

     

       40
       38
        
           xorg.libX11

     

       41
       39
        
           xorg.libXau

     

       42
       40
        
           xorg.libXdmcp

     
···

       55
       53
        
       

     

       56
       54
        
         postUnpack = ''

     

       57
       55
        
           sed -i '/set(CMAKE_CXX_FLAGS "-march=native")/d' 'source/CMakeLists.txt'

     

       56
       56
       +
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         preFixup = ''

     

       59
       59
       +
           # Remove broken uiohook development files

     

       60
       60
       +
           rm -r $out/lib/cmake $out/lib/pkgconfig

     

       58
       61
        
         '';

     

       59
       62
        
       

     

       60
       63
        
         dontWrapQtApps = true;

-62

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         obs-studio,

     

       6
       6
       -
         cmake,

     

       7
       7
       -
         qtbase,

     

       8
       8
       -
         ndi,

     

       9
       9
       -
         curl,

     

       10
       10
       -
       }:

     

       11
       11
       -
       

     

       12
       12
       -
       stdenv.mkDerivation rec {

     

       13
       13
       -
         pname = "obs-ndi";

     

       14
       14
       -
         version = "4.14.1";

     

       15
       15
       -
       

     

       16
       16
       -
         nativeBuildInputs = [

     

       17
       17
       -
           cmake

     

       18
       18
       -
           qtbase

     

       19
       19
       -
         ];

     

       20
       20
       -
         buildInputs = [

     

       21
       21
       -
           obs-studio

     

       22
       22
       -
           qtbase

     

       23
       23
       -
           ndi

     

       24
       24
       -
           curl

     

       25
       25
       -
         ];

     

       26
       26
       -
       

     

       27
       27
       -
         src = fetchFromGitHub {

     

       28
       28
       -
           owner = "Palakis";

     

       29
       29
       -
           repo = "obs-ndi";

     

       30
       30
       -
           rev = version;

     

       31
       31
       -
           sha256 = "sha256-ex/fZmZpFM6GTKNBQClzSf6Ns0Yts5+0PAmf5mIQCwc=";

     

       32
       32
       -
         };

     

       33
       33
       -
       

     

       34
       34
       -
         patches = [

     

       35
       35
       -
           ./hardcode-ndi-path.patch

     

       36
       36
       -
         ];

     

       37
       37
       -
       

     

       38
       38
       -
         postPatch = ''

     

       39
       39
       -
           # Add path (variable added in hardcode-ndi-path.patch

     

       40
       40
       -
           sed -i -e s,@NDI@,${ndi},g src/plugin-main.cpp

     

       41
       41
       -
       

     

       42
       42
       -
           # Replace bundled NDI SDK with the upstream version

     

       43
       43
       -
           # (This fixes soname issues)

     

       44
       44
       -
           rm -rf lib/ndi

     

       45
       45
       -
           ln -s ${ndi}/include lib/ndi

     

       46
       46
       -
         '';

     

       47
       47
       -
       

     

       48
       48
       -
         cmakeFlags = [ "-DENABLE_QT=ON" ];

     

       49
       49
       -
       

     

       50
       50
       -
         env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";

     

       51
       51
       -
       

     

       52
       52
       -
         dontWrapQtApps = true;

     

       53
       53
       -
       

     

       54
       54
       -
         meta = with lib; {

     

       55
       55
       -
           description = "Network A/V plugin for OBS Studio";

     

       56
       56
       -
           homepage = "https://github.com/Palakis/obs-ndi";

     

       57
       57
       -
           license = licenses.gpl2;

     

       58
       58
       -
           maintainers = with maintainers; [ jshcmpbll ];

     

       59
       59
       -
           platforms = platforms.linux;

     

       60
       60
       -
           hydraPlatforms = ndi.meta.hydraPlatforms;

     

       61
       61
       -
         };

     

       62
       62
       -
       }

-16

pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch

···

       1
       1
       -
       diff --git a/src/plugin-main.cpp b/src/plugin-main.cpp

     

       2
       2
       -
       index 0d94add..617af73 100644

     

       3
       3
       -
       --- a/src/plugin-main.cpp

     

       4
       4
       -
       +++ b/src/plugin-main.cpp

     

       5
       5
       -
       @@ -244,10 +244,7 @@ const NDIlib_v4 *load_ndilib()

     

       6
       6
       -
        	if (!path.isEmpty()) {

     

       7
       7
       -
        		locations << path;

     

       8
       8
       -
        	}

     

       9
       9
       -
       -#if defined(__linux__) || defined(__APPLE__)

     

       10
       10
       -
       -	locations << "/usr/lib";

     

       11
       11
       -
       -	locations << "/usr/local/lib";

     

       12
       12
       -
       -#endif

     

       13
       13
       -
       +	locations << "@NDI@/lib";

     

       14
       14
       -
       	for (auto location : locations) {

     

       15
       15
       -
        		path = QDir::cleanPath(

     

       16
       16
       -
        			QDir(location).absoluteFilePath(NDILIB_LIBRARY_NAME));

-95

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         curl,

     

       7
       7
       -
         git,

     

       8
       8
       -
         obs-studio,

     

       9
       9
       -
         pugixml,

     

       10
       10
       -
         qtbase,

     

       11
       11
       -
         writeScript,

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       let

     

       15
       15
       -
         websocketpp = fetchFromGitHub {

     

       16
       16
       -
           owner = "zaphoyd";

     

       17
       17
       -
           repo = "websocketpp";

     

       18
       18
       -
           rev = "0.8.2";

     

       19
       19
       -
           sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=";

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         lexbor = fetchFromGitHub {

     

       23
       23
       -
           owner = "lexbor";

     

       24
       24
       -
           repo = "lexbor";

     

       25
       25
       -
           rev = "v2.3.0";

     

       26
       26
       -
           sha256 = "sha256-s5fZWBhXC0fuHIUk1YX19bHagahOtSLlKQugyHCIlgI=";

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       29
       -
         asio = fetchFromGitHub {

     

       30
       30
       -
           owner = "chriskohlhoff";

     

       31
       31
       -
           repo = "asio";

     

       32
       32
       -
           rev = "asio-1-28-0";

     

       33
       33
       -
           sha256 = "sha256-dkiUdR8FgDnnqdptaJjE4rvNlgpC5HZl6SQQ5Di2C2s=";

     

       34
       34
       -
         };

     

       35
       35
       -
       in

     

       36
       36
       -
       stdenv.mkDerivation rec {

     

       37
       37
       -
         pname = "obs-urlsource";

     

       38
       38
       -
         version = "0.3.7";

     

       39
       39
       -
       

     

       40
       40
       -
         src = fetchFromGitHub {

     

       41
       41
       -
           owner = "locaal-ai";

     

       42
       42
       -
           repo = "obs-urlsource";

     

       43
       43
       -
           rev = version;

     

       44
       44
       -
           sha256 = "sha256-ZWwD8jJkL1rAUeanD4iChcgpnJaC5pPo36Ot36XOSx8=";

     

       45
       45
       -
           fetchSubmodules = true;

     

       46
       46
       -
         };

     

       47
       47
       -
       

     

       48
       48
       -
         nativeBuildInputs = [

     

       49
       49
       -
           cmake

     

       50
       50
       -
           git

     

       51
       51
       -
         ];

     

       52
       52
       -
         buildInputs = [

     

       53
       53
       -
           curl

     

       54
       54
       -
           obs-studio

     

       55
       55
       -
           pugixml

     

       56
       56
       -
           qtbase

     

       57
       57
       -
         ];

     

       58
       58
       -
         dontWrapQtApps = true;

     

       59
       59
       -
       

     

       60
       60
       -
         # Update websocketpp and lexabor configurations to use pre-fetched sources

     

       61
       61
       -
         postPatch = ''

     

       62
       62
       -
           sed -i 's|URL .*|SOURCE_DIR "${websocketpp}"\n    DOWNLOAD_COMMAND ""|' cmake/FetchWebsocketpp.cmake

     

       63
       63
       -
           sed -i \

     

       64
       64
       -
             -e 's|GIT_REPOSITORY .*|SOURCE_DIR "${lexbor}"|' \

     

       65
       65
       -
             -e 's|GIT_TAG .*|DOWNLOAD_COMMAND ""\n    UPDATE_COMMAND ""|' \

     

       66
       66
       -
             cmake/BuildLexbor.cmake

     

       67
       67
       -
         '';

     

       68
       68
       -
       

     

       69
       69
       -
         postInstall = ''

     

       70
       70
       -
           rm -rf $out/lib/cmake

     

       71
       71
       -
         '';

     

       72
       72
       -
       

     

       73
       73
       -
         NIX_CFLAGS_COMPILE = [

     

       74
       74
       -
           "-I${websocketpp}"

     

       75
       75
       -
           "-I${asio}/asio/include"

     

       76
       76
       -
         ];

     

       77
       77
       -
       

     

       78
       78
       -
         cmakeFlags = [

     

       79
       79
       -
           # Prevent deprecation warnings from failing the build

     

       80
       80
       -
           (lib.cmakeOptionType "string" "CMAKE_CXX_FLAGS" "-Wno-error=deprecated-declarations")

     

       81
       81
       -
           (lib.cmakeBool "ENABLE_QT" true)

     

       82
       82
       -
           (lib.cmakeBool "USE_SYSTEM_CURL" true)

     

       83
       83
       -
           (lib.cmakeBool "USE_SYSTEM_PUGIXML" true)

     

       84
       84
       -
           (lib.cmakeBool "CMAKE_COMPILE_WARNING_AS_ERROR" false)

     

       85
       85
       -
           "-Wno-dev"

     

       86
       86
       -
         ];

     

       87
       87
       -
       

     

       88
       88
       -
         meta = with lib; {

     

       89
       89
       -
           description = "OBS plugin to fetch data from a URL or file, connect to an API or AI service, parse responses and display text, image or audio on scene";

     

       90
       90
       -
           homepage = "https://github.com/locaal-ai/obs-urlsource";

     

       91
       91
       -
           maintainers = with maintainers; [ flexiondotorg ];

     

       92
       92
       -
           license = licenses.gpl2Only;

     

       93
       93
       -
           inherit (obs-studio.meta) platforms;

     

       94
       94
       -
         };

     

       95
       95
       -
       }

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

···

       20
       20
        
           hash = "sha256-Bg1n1yV4JzNFEXFNayNa1exsSZhmRJ0RLHDjLWmqGZE=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           substituteInPlace \

     

       25
       25
       +
             src/source.hpp src/source.cpp src/source_generic.cpp \

     

       26
       26
       +
             src/source_avx2.cpp src/source_avx.cpp \

     

       27
       27
       +
             --replace circlebuf deque

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       23
       30
        
         nativeBuildInputs = [

     

       24
       31
        
           cmake

     

       25
       32
        
           pkg-config