diff options
| -rw-r--r-- | modules/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/wine.nix | 23 |
3 files changed, 37 insertions, 11 deletions
diff --git a/modules/common.nix b/modules/common.nix index 9f7b98c..6a4a928 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -93,13 +93,13 @@ helix alacritty androidStudioPackages.dev - wineWowPackages.stagingFull winetricks bottles + winetricks bottles scrcpy apfs-fuse nfs-utils borgbackup pika-backup prismlauncher xonotic ]) ++ (with auxiliaryPkgs; [ - ghidra ngfx retroarch + ghidra ngfx retroarch wine ]); environment.etc.openvpn.source = "${pkgs.update-resolv-conf}/libexec/openvpn"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 1f16455..d98a640 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,17 +1,20 @@ { pkgs, unstablePkgs, ... }: -rec { - inherit (pkgs.callPackages ./electron-wayland-wrappers.nix {}) +{ + inherit (pkgs.callPackages ./electron-wayland-wrappers.nix { }) discord obsidian vscode - element-desktop; + element-desktop + ; - ghidra = unstablePkgs.callPackage ./ghidra {}; - - ngfx = pkgs.callPackage ./ngfx.nix {}; - - retroarch = pkgs.callPackage ./retroarch.nix {}; + ghidra = unstablePkgs.callPackage ./ghidra { }; - youcompleteme = pkgs.callPackage ./youcompleteme.nix {}; + ngfx = pkgs.callPackage ./ngfx.nix { }; + + retroarch = pkgs.callPackage ./retroarch.nix { }; + + youcompleteme = pkgs.callPackage ./youcompleteme.nix { }; + + wine = pkgs.callPackage ./wine.nix { }; } diff --git a/pkgs/wine.nix b/pkgs/wine.nix new file mode 100644 index 0000000..1a1d51c --- /dev/null +++ b/pkgs/wine.nix @@ -0,0 +1,23 @@ +{ + wineWowPackages, + fetchFromGitLab, + ... +}: + +let + rev = "57a658eb4a2623d801ab696e584ea08a682c4852"; + version = "9.9-unstable+${rev}"; +in +wineWowPackages.unstable.overrideAttrs ( + final: prev: { + inherit version; + # this branch includes a patch for speeding up clip studio paint startup. + src = fetchFromGitLab { + inherit rev; + hash = "sha256-A3Pz3lwkaHUs5L/yaTypVmJCsYg+Ze9wZVB5DO7iJWo="; + domain = "gitlab.winehq.org"; + owner = "DarkShadow44"; + repo = "wine"; + }; + } +) |