summary refs log tree commit diff
path: root/pkgs/applications/video/obs-studio
diff options
context:
space:
mode:
authorPhilip Munksgaard <philip@munksgaard.me>2020-10-03 20:11:17 +0200
committerPhilip Munksgaard <philip@munksgaard.me>2020-11-01 21:33:04 +0100
commitcbcb8418746ee98598bcec0e8a8442531ad129a4 (patch)
tree6b0a7955d565bea69f43525d4b94ec858da6d80d /pkgs/applications/video/obs-studio
parentf0d31b3bd16e47009337b6e5fe3b36ae70dbcb46 (diff)
downloadnixpkgs-cbcb8418746ee98598bcec0e8a8442531ad129a4.tar
nixpkgs-cbcb8418746ee98598bcec0e8a8442531ad129a4.tar.gz
nixpkgs-cbcb8418746ee98598bcec0e8a8442531ad129a4.tar.bz2
nixpkgs-cbcb8418746ee98598bcec0e8a8442531ad129a4.tar.lz
nixpkgs-cbcb8418746ee98598bcec0e8a8442531ad129a4.tar.xz
nixpkgs-cbcb8418746ee98598bcec0e8a8442531ad129a4.tar.zst
nixpkgs-cbcb8418746ee98598bcec0e8a8442531ad129a4.zip
Remove obs-linuxbrowser
No longer needed since #99284
Diffstat (limited to 'pkgs/applications/video/obs-studio')
-rw-r--r--pkgs/applications/video/obs-studio/default.nix1
-rw-r--r--pkgs/applications/video/obs-studio/linuxbrowser.nix49
2 files changed, 0 insertions, 50 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 518168b1587..cdecde6b869 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -86,7 +86,6 @@ in mkDerivation rec {
     cp -r ${libcef}/lib/libcef.so cef/Release/
     cp -r ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
     cp -r ${libcef}/include cef/
-    ls -R cef
   '';
 
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
deleted file mode 100644
index a33383937fb..00000000000
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-# We don't have a wrapper which can supply obs-studio plugins so you have to
-# somewhat manually install this:
-
-# nix-env -f . -iA obs-linuxbrowser
-# mkdir -p ~/.config/obs-studio/plugins
-# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/
-
-{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }:
-
-stdenv.mkDerivation rec {
-  pname = "obs-linuxbrowser";
-  version = "0.6.1-6-gf86dba6";
-
-  src = fetchFromGitHub {
-    owner = "bazukas";
-    repo = "obs-linuxbrowser";
-    rev = version;
-    sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ obs-studio ];
-  postUnpack = ''
-    mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
-    for i in ${libcef}/share/cef/*; do
-      ln -s $i cef/Release/
-      ln -s $i cef/Resources/
-    done
-    ln -s ${libcef}/lib/libcef.so cef/Release/
-    ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
-    ln -s ${libcef}/include cef/
-  '';
-  cmakeFlags = [
-    "-DCEF_ROOT_DIR=../../cef"
-    "-DOBS_INCLUDE_SEARCH_DIR=${obs-studio}/include/obs"
-  ];
-  installPhase = ''
-    mkdir -p $out/share/obs/obs-plugins
-    cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Browser source plugin for obs-studio based on Chromium Embedded Framework";
-    homepage = "https://github.com/bazukas/obs-linuxbrowser";
-    maintainers = with maintainers; [ puffnfresh ];
-    license = licenses.gpl2;
-    platforms = with platforms; linux;
-  };
-}