From 55cd340d4ac2023d6f3eca515d0ccc38c61756d5 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 2 Jun 2024 12:00:00 +0000 Subject: [PATCH] linuxPackages.rr-zen_workaround: now included in rr sources --- pkgs/development/tools/analysis/rr/zen_workaround.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index 64a44b18fe29..4410224e8454 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -1,17 +1,14 @@ -{ stdenv, lib, fetchzip, kernel }: +{ stdenv, lib, kernel, rr }: /* The python script shouldn't be needed for users of this kernel module. https://github.com/rr-debugger/rr/blob/master/scripts/zen_workaround.py The module itself is called "zen_workaround" (a bit generic unfortunately). */ -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rr-zen_workaround"; - version = "2023-11-23"; - src = fetchzip { - url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/f9d2070a7d87388da39acd157e0e53666a7d6ee0.zip"; - sha256 = "sha256-VqqKYjd8J7Uh5ea+PjLT93cNdQFvGIwGu4bzx+weSvo="; - }; + inherit (rr) src version; + sourceRoot = "source/third-party/zen-pmu-workaround"; hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies;