massive lsp evaluated rewrite

This commit is contained in:
2024-06-08 23:54:40 -06:00
parent 6ec6eb239a
commit fd340effd9
46 changed files with 227 additions and 242 deletions

View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsa-lib, ffmpeg, kdePackages
, kdsingleapplication, openssl, pipewire, taglib, zlib }:
, kdsingleapplication, pipewire, taglib }:
stdenv.mkDerivation (finalAttrs: {
pname = "fooyin";
@@ -28,8 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false))
# we need INSTALL_FHS to be true as the various artifacts are otherwise just dumped in the root
# of $out and the fixupPhase cleans things up anyway
(lib.cmakeBool "INSTALL_FHS" true)
];

View File

@@ -1,21 +1,16 @@
{ pkgs, lib, config, ... }:
with lib;
let cfg = config.programs.obs-studio;
in {
options.programs.obs-studio = {
enable = mkEnableOption "OBS Studio program";
package = mkOption {
type = types.package;
enable = lib.mkEnableOption "OBS Studio program";
package = lib.mkOption {
type = lib.types.package;
default = pkgs.obs-studio;
defaultText = "pkgs.obs-studio";
description = "Set obs-studio package to use.";
};
enableVirtualCamera = mkOption {
type = types.bool;
enableVirtualCamera = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Installs and sets up the v4l2loopback kernel module, necesary for OBS
@@ -23,20 +18,15 @@ in {
'';
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
boot = mkIf cfg.enableVirtualCamera {
boot = lib.mkIf cfg.enableVirtualCamera {
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
extraModprobeConfig = ''
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
'';
};
security.polkit.enable = mkIf cfg.enableVirtualCamera true;
security.polkit.enable = lib.mkIf cfg.enableVirtualCamera true;
};
meta.maintainers = with lib.maintainers; [ CaptainJawZ ];
meta.maintainers = [ lib.maintainers.CaptainJawZ ];
}

View File

@@ -6,10 +6,10 @@
let
polymc = let
binpath = lib.makeBinPath ([ xorg.xrandr glxinfo pciutils ]);
binpath = lib.makeBinPath [ xorg.xrandr glxinfo pciutils ];
libpath = with xorg;
lib.makeLibraryPath ([
lib.makeLibraryPath [
libX11
libXext
libXcursor
@@ -23,7 +23,7 @@ let
udev
flite
stdenv.cc.cc.lib
]);
];
gameLibraryPath = libpath + ":${addOpenGLRunpath.driverLink}/lib";
@@ -107,7 +107,7 @@ let
ln -s $src/share $out/share
'';
postFixup = let javaPaths = lib.makeSearchPath "bin/java" (extraJDKs);
postFixup = let javaPaths = lib.makeSearchPath "bin/java" extraJDKs;
in ''
wrapProgram $out/bin/polymc \
--suffix LD_LIBRARY_PATH : "${libsPath}" \

View File

@@ -12,11 +12,11 @@ appimageTools.wrapType1 rec {
curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
'';
meta = with lib; {
meta = {
description = "Reference Image Viewer";
homepage = "https://www.pureref.com";
license = licenses.unfree;
maintainers = with maintainers; [ elnudev ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.elnudev ];
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};