Merge pull request #143 from DarkKirb/use-x64-wine
Use x86_64-linux wine on all arches
This commit is contained in:
commit
35224be111
2 changed files with 21 additions and 7 deletions
|
@ -25,10 +25,10 @@ in {
|
||||||
fontconfig = {
|
fontconfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultFonts = {
|
defaultFonts = {
|
||||||
emoji = [ "Noto Color Emoji" ];
|
emoji = ["Noto Color Emoji"];
|
||||||
monospace = [ "Fira Code" "Font Awesome 5 Free" ];
|
monospace = ["Fira Code" "Font Awesome 5 Free"];
|
||||||
sansSerif = [ "Noto Sans" "Font Awesome 5 Free" ];
|
sansSerif = ["Noto Sans" "Font Awesome 5 Free"];
|
||||||
serif = [ "Noto Serif" "Font Awesome 5 Free" ];
|
serif = ["Noto Serif" "Font Awesome 5 Free"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
fonts = with pkgs; [
|
fonts = with pkgs; [
|
||||||
|
@ -129,5 +129,13 @@ in {
|
||||||
};
|
};
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
services.dbus.enable = true;
|
services.dbus.enable = true;
|
||||||
services.dbus.packages = with pkgs; [ dconf ];
|
services.dbus.packages = with pkgs; [dconf];
|
||||||
|
# Futureproofing: on non-x86 machines, emulate x86
|
||||||
|
boot.binfmt.emulatedSystems =
|
||||||
|
if system != "x86_64-linux"
|
||||||
|
then [
|
||||||
|
"x86_64-linux"
|
||||||
|
"i686-linux"
|
||||||
|
]
|
||||||
|
else [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,15 @@
|
||||||
args: {pkgs, ...}: {
|
args: {
|
||||||
|
pkgs,
|
||||||
|
nixpkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
x86_64-linux-pkgs = import nixpkgs {system = "x86_64-linux";};
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(import ./grapejuice.nix args)
|
(import ./grapejuice.nix args)
|
||||||
];
|
];
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.wineWowPackages.staging
|
x86_64-linux-pkgs.wineWowPackages.staging
|
||||||
pkgs.prismlauncher
|
pkgs.prismlauncher
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue