From 62d4b43fa5d2529f50e3ecdf7dce54285782375c Mon Sep 17 00:00:00 2001 From: uku Date: Thu, 11 Jan 2024 18:52:26 +0100 Subject: [PATCH] add obs-studio overlay --- exprs/lunar-client.nix | 40 ---------------------------------------- exprs/overlay.nix | 4 +++- systems/desktop.nix | 1 - 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 exprs/lunar-client.nix diff --git a/exprs/lunar-client.nix b/exprs/lunar-client.nix deleted file mode 100644 index 7a9ab91..0000000 --- a/exprs/lunar-client.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - appimageTools, - fetchurl, - lib, - makeWrapper, -}: let - pname = "lunar-client"; - version = "3.2.0"; - - src = fetchurl { - url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha256-Y9SjcVQ+7tmX6vKdYuD4JtTDJNmMKliEN5Yl41/WJjs="; - }; - - appimageContents = appimageTools.extract {inherit pname version src;}; -in - appimageTools.wrapType2 rec { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - install -Dm444 ${appimageContents}/launcher.desktop $out/share/applications/lunar-client.desktop - install -Dm444 ${appimageContents}/launcher.png $out/share/pixmaps/lunar-client.png - substituteInPlace $out/share/applications/lunar-client.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \ - --replace 'Icon=launcher' 'Icon=lunar-client' - ''; - - meta = with lib; { - description = "Free Minecraft client with mods, cosmetics, and performance boost."; - homepage = "https://www.lunarclient.com/"; - license = with licenses; [mit]; # colon 3 - mainProgram = "lunar-client"; - maintainers = with maintainers; [zyansheep Technical27 surfaceflinger]; - platforms = ["x86_64-linux"]; - }; - } diff --git a/exprs/overlay.nix b/exprs/overlay.nix index 1527621..cbd29d1 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -7,5 +7,7 @@ final: prev: { meta.knownVulnerabilities = []; # NixOS/nixpkgs#273611 }); - lunar-client = prev.callPackage ./lunar-client.nix {}; + obs-studio = prev.obs-studio.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [(prev.lib.cmakeBool "ENABLE_LIBFDK" true)]; # NixOS/nixpkgs#278127 + }); } diff --git a/systems/desktop.nix b/systems/desktop.nix index e6b9bec..416b060 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -136,7 +136,6 @@ in { gnome.gnome-calculator jetbrains.idea-ultimate libreoffice-fresh - lunar-client mate.eom mold mpv