diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-18 00:37:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 00:37:02 +0100 |
| commit | cf4fee6f3760b2ff882c441f162865c179f47b5f (patch) | |
| tree | c4198133f07bbc6e7bc3750d7c7eab29693406da /pkgs/by-name | |
| parent | 4774c5365c67d337c6d7d860103466494910a728 (diff) | |
| parent | 413cd10b6af4371d85ae0344b7006df5e0689fb1 (diff) | |
| download | nixpkgs-cf4fee6f3760b2ff882c441f162865c179f47b5f.tar nixpkgs-cf4fee6f3760b2ff882c441f162865c179f47b5f.tar.gz nixpkgs-cf4fee6f3760b2ff882c441f162865c179f47b5f.tar.bz2 nixpkgs-cf4fee6f3760b2ff882c441f162865c179f47b5f.tar.lz nixpkgs-cf4fee6f3760b2ff882c441f162865c179f47b5f.tar.xz nixpkgs-cf4fee6f3760b2ff882c441f162865c179f47b5f.tar.zst nixpkgs-cf4fee6f3760b2ff882c441f162865c179f47b5f.zip | |
Merge pull request #267322 from reckenrode/dxvk-nixpkgs-cross
dxvk: rely on the cross support in nixpkgs
Diffstat (limited to 'pkgs/by-name')
| -rw-r--r-- | pkgs/by-name/dx/dxvk_1/package.nix | 16 | ||||
| -rw-r--r-- | pkgs/by-name/dx/dxvk_2/package.nix | 17 |
2 files changed, 9 insertions, 24 deletions
diff --git a/pkgs/by-name/dx/dxvk_1/package.nix b/pkgs/by-name/dx/dxvk_1/package.nix index 44a39eeaba2..a02680d77ee 100644 --- a/pkgs/by-name/dx/dxvk_1/package.nix +++ b/pkgs/by-name/dx/dxvk_1/package.nix @@ -9,9 +9,6 @@ , enableMoltenVKCompat ? false }: -let - isCross = stdenv.hostPlatform != stdenv.targetPlatform; -in stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; version = "1.10.3"; @@ -36,15 +33,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ glslang meson ninja ]; buildInputs = [ windows.pthreads ]; - mesonFlags = - let - arch = if stdenv.is32bit then "32" else "64"; - in - [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ] - ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ]; + mesonFlags = [ + "--buildtype" "release" + "--prefix" "${placeholder "out"}" + ]; meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix index e1fa64ffee0..8c589fd7258 100644 --- a/pkgs/by-name/dx/dxvk_2/package.nix +++ b/pkgs/by-name/dx/dxvk_2/package.nix @@ -19,7 +19,6 @@ assert !sdl2Support || !glfwSupport; let - isCross = stdenv.hostPlatform != stdenv.targetPlatform; isWindows = stdenv.hostPlatform.uname.system == "Windows"; in stdenv.mkDerivation (finalAttrs: { @@ -51,18 +50,12 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p include/spirv/include include/vulkan/include ''; - mesonFlags = - let - arch = if stdenv.is32bit then "32" else "64"; - in - [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ] - ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ] - ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + mesonFlags = [ + "--buildtype" "release" + "--prefix" "${placeholder "out"}" + ] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; - doCheck = !isCross; + doCheck = true; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; |