Refactor user group assignment in minimal default.nix and clean up unused dependencies in citron-emu package.nix

This commit is contained in:
Chris Toph 2025-04-22 21:13:47 -04:00
parent 856376d758
commit 844e4f6184
2 changed files with 1 additions and 76 deletions

View file

@ -15,9 +15,9 @@ in
users.users.${hostSpec.username} = { users.users.${hostSpec.username} = {
isNormalUser = true; isNormalUser = true;
password = hostSpec.password; password = hostSpec.password;
group = "ryot";
extraGroups = [ extraGroups = [
"wheel" "wheel"
"ryot"
]; ];
}; };
} }

View file

@ -6,93 +6,18 @@ pkgs.stdenvNoCC.mkDerivation rec {
url = "https://git.citron-emu.org/Citron/Citron/releases/download/v0.6.1-canary-refresh/Citron-Linux-Canary-Refresh_0.6.1_compatibility.tar.gz"; url = "https://git.citron-emu.org/Citron/Citron/releases/download/v0.6.1-canary-refresh/Citron-Linux-Canary-Refresh_0.6.1_compatibility.tar.gz";
sha256 = "sha256:00d2mn2pc51gaz47db15q95gkd6x3566a2a8vc0lhq37jvyfq72r"; sha256 = "sha256:00d2mn2pc51gaz47db15q95gkd6x3566a2a8vc0lhq37jvyfq72r";
}; };
# sourceRoot = ".";
# nativeBuildInputs = with pkgs; [
# gzip
# ];
runtimeLibs = with pkgs; [ runtimeLibs = with pkgs; [
qt6.qtbase qt6.qtbase
ffmpeg ffmpeg
libusb1 libusb1
libva libva
SDL2 SDL2
# libGL
# libGLU
# libevent
# libffi
# libjpeg
# libpng
# libstartup_notification
# libvpx
# libwebp
# git
# vulkan-headers
# vulkan-utility-libraries
# boost185
# autoconf
# fmt
# llvm_19
# nasm
# lz4
# nlohmann_json
# ffmpeg
# # qt6.qtbase
# # enet
# libva
# # vcpkg
# # libopus
# # udev
# stdenv.cc.cc
# fontconfig
# libxkbcommon
# zlib
# freetype
# gtk3
# libxml2
# dbus
# xcb-util-cursor
# alsa-lib
# libpulseaudio
# pango
# atk
# cairo
# gdk-pixbuf
# glib
# udev
# libva
# mesa
# libnotify
# cups
# pciutils
# ffmpeg
# libglvnd
# pipewire
]; ];
# ++ (with pkgs.xorg; [
# libxcb
# libX11
# libXcursor
# libXrandr
# libXi
# libXext
# libXcomposite
# libXdamage
# libXfixes
# libXScrnSaver
# ]);
nativeBuildInputs = nativeBuildInputs =
with pkgs; with pkgs;
[ [
autoPatchelfHook autoPatchelfHook
kdePackages.wrapQtAppsHook kdePackages.wrapQtAppsHook
# makeWrapper
# copyDesktopItems
# wrapGAppsHook
] ]
++ runtimeLibs; ++ runtimeLibs;