diff options
| author | Someone <sergei.kozlukov@aalto.fi> | 2024-04-13 10:38:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 10:38:48 +0000 |
| commit | c6e5499be1a9369e0808e6c4a2fce2ba375dd7f3 (patch) | |
| tree | b2aba16251b76cb14c7f06771508c0a51334c1a5 | |
| parent | 521da6940cb2ad4049d54ed08b13f83d0e3d6e41 (diff) | |
| parent | d6733d933ddce467d1b1d12e9265eb205c23fcdd (diff) | |
Merge pull request #303433 from SomeoneSerge/update/rerun
rerun: fix the checkPhase
| -rw-r--r-- | pkgs/by-name/re/rerun/package.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 9c96b86f64c9f..844f97700c226 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -1,6 +1,7 @@ { lib, rustPlatform, + fetchpatch, fetchFromGitHub, pkg-config, stdenv, @@ -32,6 +33,14 @@ rustPlatform.buildRustPackage rec { patches = [ # Disables a doctest that depends on a nightly feature ./0001-re_space_view_time_series-utils-patch-out-doctests-w.patch + + + # "Fix cell size test now that the overhead has shrunk" + # https://github.com/rerun-io/rerun/pull/5917 + (fetchpatch { + url = "https://github.com/rerun-io/rerun/commit/933fc5cc1f3ee262a78bd4647257295747671152.patch"; + hash = "sha256-jCeGfzKt0oYqIea+7bA2V/U9VIjhVvfQzLRrYG4jaHY="; + }) ]; cargoHash = "sha256-qvnkOlcjADV4b+JfFAy9yNaZGaf0ZO7hh9HBg5XmPi0="; @@ -96,7 +105,7 @@ rustPlatform.buildRustPackage rec { ) ''; - postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; cargoTestFlags = [ "-p" |