From 2df126c3ddd251ab9207b0a021fba18c63451866 Mon Sep 17 00:00:00 2001 From: nat Date: Sat, 11 Nov 2023 17:50:39 +0100 Subject: [PATCH] graphene-hardened-malloc: migrate to by-name, build light variant --- .../gr/graphene-hardened-malloc/package.nix} | 24 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 18 insertions(+), 8 deletions(-) rename pkgs/{development/libraries/graphene-hardened-malloc/default.nix => by-name/gr/graphene-hardened-malloc/package.nix} (89%) diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix similarity index 89% rename from pkgs/development/libraries/graphene-hardened-malloc/default.nix rename to pkgs/by-name/gr/graphene-hardened-malloc/package.nix index 48df439a1efb..50390917b816 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -1,9 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub +{ fetchFromGitHub +, lib +, makeWrapper , python3 , runCommand -, makeWrapper +, stdenv , stress-ng }: @@ -18,18 +18,30 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ujwzr4njNsf/VTyEq7zKHWxoivU3feavSTx+MLIj1ZM="; }; - doCheck = true; nativeCheckInputs = [ python3 ]; # these tests cover use as a build-time-linked library checkTarget = "test"; + doCheck = true; + + buildPhase = '' + runHook preBuild + + for VARIANT in default light; do make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} VARIANT=$VARIANT; done + + runHook postBuild + ''; installPhase = '' + runHook preInstall + install -Dm444 -t $out/include include/* - install -Dm444 -t $out/lib out/libhardened_malloc.so + install -Dm444 -t $out/lib out/libhardened_malloc.so out-light/libhardened_malloc-light.so mkdir -p $out/bin substitute preload.sh $out/bin/preload-hardened-malloc --replace "\$dir" $out/lib chmod 0555 $out/bin/preload-hardened-malloc + + runHook postInstall ''; separateDebugInfo = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68255c9fa231..920d6c601fce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18977,8 +18977,6 @@ with pkgs; grail = callPackage ../development/libraries/grail { }; - graphene-hardened-malloc = callPackage ../development/libraries/graphene-hardened-malloc { }; - graphene = callPackage ../development/libraries/graphene { }; griffe = with python3Packages; toPythonApplication griffe;