This commit is contained in:
PapaTutuWawa 2022-10-18 20:04:39 +02:00
parent dffafa8973
commit 0a36b0acb5
5 changed files with 56 additions and 4 deletions

View File

@ -128,6 +128,14 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ansible ansible
gnumake gnumake
(pkgs.callPackage ./wrapper.nix {
inherit (pkgs) retroarch;
cores = with pkgs.libretro; [
mgba mupen64plus melonds desmume dolphin
];
})
]; ];
programs = { programs = {

37
hosts/wrapper.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, lib, makeWrapper, retroarch, cores ? [ ] }:
stdenv.mkDerivation {
pname = "retroarch";
version = lib.getVersion retroarch;
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/lib
for coreDir in $cores
do
ln -s $coreDir/* $out/lib/.
done
ln -s -t $out ${retroarch}/share
if [ -d ${retroarch}/Applications ]; then
ln -s -t $out ${retroarch}/Applications
fi
makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \
--suffix-each LD_LIBRARY_PATH ':' "$cores" \
--add-flags "-L $out/lib/" \
'';
cores = map (x: x + x.libretroCore) cores;
preferLocalBuild = true;
meta = with retroarch.meta; {
inherit changelog description homepage license maintainers platforms;
longDescription =
"RetroArch is the reference frontend for the libretro API. The following cores are included: "
+ lib.concatStringsSep ", " (map (x: "${x.name}") cores)
+ ".";
};
}

View File

@ -33,7 +33,14 @@ in {
}; };
networking = { networking = {
useDHCP = false; # Done by the network manager useDHCP = false; # Done by the network manager
networkmanager.enable = true; networkmanager = {
enable = true;
plugins = with pkgs; [
networkmanager-vpnc
networkmanager-openvpn
networkmanager-openconnect
];
};
#interfaces.*.useDHCP = false; #interfaces.*.useDHCP = false;

View File

@ -14,7 +14,7 @@ in {
description = "Ignore NixOS 'recommendations' and use the Wayland session by default"; description = "Ignore NixOS 'recommendations' and use the Wayland session by default";
}; };
}; };
sddm = { /*sddm = {
backgroundImage = lib.mkOption { backgroundImage = lib.mkOption {
default = "${pkgs.sddm-sugar-dark}/usr/share/sddm/themes/sugar-dark/Background.jpg"; default = "${pkgs.sddm-sugar-dark}/usr/share/sddm/themes/sugar-dark/Background.jpg";
description = "The background image to use with sddm-sugar-dark"; description = "The background image to use with sddm-sugar-dark";
@ -27,7 +27,7 @@ in {
default = 1080; default = 1080;
description = "Width of the screen"; description = "Width of the screen";
}; };
}; };*/
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {

View File

@ -83,7 +83,7 @@ in {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
#extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; #extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
gtkUsePortal = true; #gtkUsePortal = true;
}; };
qt5 = { qt5 = {