Compare commits

...

2 commits

Author SHA1 Message Date
a70da63d61
use the voc's fork of obs
notes:
 - doesn't use niv to manage its sources, since apparently niv doesn't
   support git submodules
 - haven't tested that this actually builds (it does build without the
   blackmagic stuff, which I don't have locally and didn't have the
   patience to fetch)
2021-12-22 14:24:44 +01:00
schweby
c954df75a5 nixda: disable companion 2021-12-19 17:21:43 +01:00
2 changed files with 25 additions and 4 deletions

View file

@ -24,8 +24,8 @@
hardware.decklink.enable = true; hardware.decklink.enable = true;
networking.hostName = "nixda"; # Define your hostname. networking.hostName = "nixda"; # Define your hostname.
## environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender companion ];
environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender companion ]; environment.systemPackages = with pkgs; [ blackmagicDesktopVideo blender ];
networking.wg-quick.interfaces.cornbox = { networking.wg-quick.interfaces.cornbox = {
privateKeyFile = "/etc/wireguard/cornbox.key"; privateKeyFile = "/etc/wireguard/cornbox.key";

View file

@ -11,7 +11,7 @@ let
newpkgs = { newpkgs = {
alps = callPackage ./alps {}; alps = callPackage ./alps {};
companion = callPackage ./companion {}; # companion = callPackage ./companion {};
libvips = callPackage ./libvips {}; libvips = callPackage ./libvips {};
docker = pkgs.docker.overrideAttrs (super: { docker = pkgs.docker.overrideAttrs (super: {
@ -26,7 +26,28 @@ let
blackmagicDesktopVideo = callPackage ./blackmagic-desktop-video { }; blackmagicDesktopVideo = callPackage ./blackmagic-desktop-video { };
obs-studio = unstable.obs-studio.overrideAttrs (_: rec { obs-studio = unstable.obs-studio.overrideAttrs (old: rec {
src = pkgs.fetchgit {
url = "https://github.com/lukas2511/obs-studio";
rev = "93ae2b1c11ad81787d69f30c6c251f02dc72c2f4";
sha256 = "0zla25bjlqx78rb3fgc2yj8bgb4w4lfq6ans47mpb9nvm5ngx5rn";
fetchSubmodules = true;
};
buildInputs = old.buildInputs ++ [ pkgs.libdrm ];
# disable browser-source patches which don't fit on this version of obs
patches = [];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\""
"-DOBS_VERSION_OVERRIDE=27.0.1"
"-Wno-dev" # kill dev warnings that are useless for packaging
# is there a better way to change just one flag? (this is where I miss guix tbh)
# anyways turns browser sources off
"-DBUILD_BROWSER=OFF"
"-DCEF_ROOT_DIR=../../cef"
];
wrapLibraries = with (pkgs // newpkgs); [ wrapLibraries = with (pkgs // newpkgs); [
xorg.libX11.out xorg.libX11.out
libvlc libvlc