Skip to content

Commit

Permalink
pkgsi686Linux.vulkan-loader: drop upstreamed 32-bit patch
Browse files Browse the repository at this point in the history
Without the change the build fails on `staging` as:

       > applying patch /nix/store/d4cmw6xgqzlqraj0xk9f4c5xsryc7amg-ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch
       > patching file CMakeLists.txt
       > Hunk NixOS#1 FAILED at 190.
  • Loading branch information
trofi committed Jan 19, 2025
1 parent 6d43eca commit d73d332
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions pkgs/by-name/vu/vulkan-loader/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
libX11,
Expand All @@ -28,15 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
};

patches =
[ ./fix-pkgconfig.patch ]
++ lib.optionals stdenv.hostPlatform.is32bit [
# Backport patch to support 64-bit inodes on 32-bit systems
# FIXME: remove in next update
(fetchpatch {
url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch";
hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0=";
})
];
[ ./fix-pkgconfig.patch ];

nativeBuildInputs = [
cmake
Expand Down

0 comments on commit d73d332

Please sign in to comment.