diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix | |
parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix b/nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix index 298aec48db75..59df670e9ec5 100644 --- a/nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/microsoft-gsl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , gtest , pkg-config @@ -23,6 +24,15 @@ stdenv.mkDerivation rec { # error: unsafe buffer access env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; + patches = [ + # nvcc doesn't recognize the "gsl" attribute namespace (microsoft/onnxruntime#13573) + # only affects nvcc + (fetchpatch { + url = "https://raw.githubusercontent.com/microsoft/onnxruntime/4bfa69def85476b33ccfaf68cf070f3fb65d39f7/cmake/patches/gsl/1064.patch"; + hash = "sha256-0jESA+VENWQms9HGE0jRiZZuWLJehBlbArxSaQbYOrM="; + }) + ]; + doCheck = true; meta = with lib; { |