pyrox.dev
Merge pull request #267322 from reckenrode/dxvk-nixpkgs-cross
dxvk: rely on the cross support in nixpkgs
authored by Weijia Wang and committed by GitHub cf4fee6f 4774c536
+4
-12
pkgs/by-name/dx/dxvk_1/package.nix
+4
-12
pkgs/by-name/dx/dxvk_1/package.nix
···
9
9
, enableMoltenVKCompat ? false
10
10
}:
11
11
12
-
let
13
-
isCross = stdenv.hostPlatform != stdenv.targetPlatform;
14
-
in
15
12
stdenv.mkDerivation (finalAttrs: {
16
13
pname = "dxvk";
17
14
version = "1.10.3";
···
36
33
nativeBuildInputs = [ glslang meson ninja ];
37
34
buildInputs = [ windows.pthreads ];
38
35
39
-
mesonFlags =
40
-
let
41
-
arch = if stdenv.is32bit then "32" else "64";
42
-
in
43
-
[
44
-
"--buildtype" "release"
45
-
"--prefix" "${placeholder "out"}"
46
-
]
47
-
++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ];
36
+
mesonFlags = [
37
+
"--buildtype" "release"
38
+
"--prefix" "${placeholder "out"}"
39
+
];
48
40
49
41
meta = {
50
42
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
+5
-12
pkgs/by-name/dx/dxvk_2/package.nix
+5
-12
pkgs/by-name/dx/dxvk_2/package.nix
···
19
19
assert !sdl2Support || !glfwSupport;
20
20
21
21
let
22
-
isCross = stdenv.hostPlatform != stdenv.targetPlatform;
23
22
isWindows = stdenv.hostPlatform.uname.system == "Windows";
24
23
in
25
24
stdenv.mkDerivation (finalAttrs: {
···
51
50
mkdir -p include/spirv/include include/vulkan/include
52
51
'';
53
52
54
-
mesonFlags =
55
-
let
56
-
arch = if stdenv.is32bit then "32" else "64";
57
-
in
58
-
[
59
-
"--buildtype" "release"
60
-
"--prefix" "${placeholder "out"}"
61
-
]
62
-
++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ]
63
-
++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw";
53
+
mesonFlags = [
54
+
"--buildtype" "release"
55
+
"--prefix" "${placeholder "out"}"
56
+
] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw";
64
57
65
-
doCheck = !isCross;
58
+
doCheck = true;
66
59
67
60
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
68
61