philipp/nixcitizen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bump for SC 3.17.1

Browse source
This commit is contained in:
Philipp 2022-05-22 10:33:51 +02:00
parent 7ec5a43045
commit babf9caf55
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
default.nix
View file

@ -7,7 +7,7 @@
vulkanDrivers ? [ ], vulkanDrivers ? [ ],
dxvkPatches ? [ ], dxvkPatches ? [ ],
dxvkAsync ? false, dxvkAsync ? false,
winePackage ? pkgs.wineWowPackages.unstable, winePackage ? pkgs.wineWowPackages.staging,
wineSrc ? null, wineSrc ? null,
wineGlobalEnv ? [ "DXVK_STATE_CACHE=0" ], wineGlobalEnv ? [ "DXVK_STATE_CACHE=0" ],
winePatches ? [], winePatches ? [],
@ -28,19 +28,15 @@ assert !(builtins.any (lib.strings.hasSuffix "/") [ installDir launcherCache pre
let let
wineReccomendedPatches = [ wineReccomendedPatches = [
(fetchpatch { (fetchpatch {
name = "joyaxis.patch"; name = "ernel32-SetThreadInformation-stub";
url = "https://raw.githubusercontent.com/snatella/wine-runner-sc/5e48a6fb974da9f1585043a236026c7c57272e67/patches/6.4/joyaxis.patch"; url = "https://gist.githubusercontent.com/ananace/1139461949d532fea812ac53a6b016bb/raw/5e343820890acb7a2e9b49cc3cf7a6703694bffa/kernel32-SetThreadInformation-stub.mypatch";
sha256 = "18f87anf0rkvbkjhgm9j6n2cccp1wl82a12vhzr7a4p7bc025yrz"; sha256 = "sha256-2FfHFu8juzIVMUsKgfu2hgA0u017bDQiie9RHxMgh4g=";
})
(fetchpatch {
name = "StorageDeviceSeekPenalty.patch";
url = "https://raw.githubusercontent.com/Frogging-Family/community-patches/f96b11b79d6aada264838d780dfd5a14f85cced0/wine-tkg-git/star-citizen-StorageDeviceSeekPenaltyProperty.mypatch";
sha256 = "01ilxhl90ib05jwsqy0iajqixdvd571ad803z1qj3lgjk3siff13";
}) })
]; ];
winePkg = winePackage.overrideAttrs (attrs: { winePkg = winePackage.overrideDerivation (attrs: {
patches = (if wineSrc == null then attrs.patches else []) ++ winePatches ++ lib.optional applyReccomendedWinePatches wineReccomendedPatches; patches = (if wineSrc == null then attrs.patches else []) ++ winePatches ++ lib.optional applyReccomendedWinePatches wineReccomendedPatches;
disabledPatchsets = [ "ntdll-*" ];
src = if wineSrc != null then wineSrc else attrs.src; src = if wineSrc != null then wineSrc else attrs.src;
}); });
@ -59,12 +55,12 @@ let
fonts = pkgs.callPackage ./fonts.nix {}; fonts = pkgs.callPackage ./fonts.nix {};
rsiInstaller = fetchurl { rsiInstaller = fetchurl {
url = "https://install.robertsspaceindustries.com/star-citizen/RSI-Setup-1.4.11.exe"; url = "https://install.robertsspaceindustries.com/star-citizen/RSI-Setup-1.5.5.exe";
sha256 = "1afc4b36dd1e22d75df8da2ecb925833f9b10327c991be20e138503cde627022"; sha256 = "sha256-w0pLj0/awT4nmDpG8INSbjVQM63zCRvUUJ/36+r/JrE=";
}; };
vcrun2019 = fetchurl { vcrun2019 = fetchurl {
url = "https://aka.ms/vs/16/release/vc_redist.x86.exe"; url = "https://aka.ms/vs/16/release/vc_redist.x86.exe";
sha256 = "1p22ibzx80zn2gxavmcsz7adkr5672smmlwgapfvx6a04f9n7a7k"; sha256 = "sha256-TGxCDPTL8snJ7UdullgK6SqXsoIsITKaLknoQ5rFrTA=";
}; };
win10Reg = pkgs.writeTextFile { win10Reg = pkgs.writeTextFile {
@ -193,7 +189,7 @@ let
#optionally export vulkan drivers: #optionally export vulkan drivers:
#The following line might be empty in the resulting script. #The following line might be empty in the resulting script.
${lib.optionalString (vulkanDrivers != []) "export VK_ICD_FILENAMES=${vkIcd}"} # ${lib.optionalString (vulkanDrivers != []) "export VK_ICD_FILENAMES=${vkIcd}"}
#export all global env vars #export all global env vars
${lib.concatMapStrings (x: "export " + x + "\n") (wineGlobalEnv ${lib.concatMapStrings (x: "export " + x + "\n") (wineGlobalEnv