From d9d028f0dddaeaa9c7dd16863303d48e224d1575 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 21 Jun 2023 16:17:45 +0800 Subject: [PATCH 1/2] blktrace: fix cross compilation --- pkgs/os-specific/linux/blktrace/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index 8ff4b16a1a53..a812c50e5b9c 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ libaio ]; - preConfigure = '' - sed s,/usr/local,$out, -i Makefile - ''; + makeFlags = [ + "prefix=${placeholder "out"}" + "CC:=$(CC)" + ]; meta = with lib; { description = "Block layer IO tracing mechanism"; From c1e772cc6c83cf820b95492153d9c8be713b004a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 21 Jun 2023 16:19:56 +0800 Subject: [PATCH 2/2] blktrace: fix license, add nickcao to maintainers --- pkgs/os-specific/linux/blktrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index a812c50e5b9c..d1b2376e7bd2 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Block layer IO tracing mechanism"; - maintainers = with maintainers; [ ]; - license = licenses.gpl2; + maintainers = with maintainers; [ nickcao ]; + license = licenses.gpl2Plus; platforms = platforms.linux; }; }