diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/graphene-hardened-malloc | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/graphene-hardened-malloc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 65498357b5d0..1e2eddf27519 100644 --- a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -7,23 +7,21 @@ , stress-ng }: -lib.fix (self: stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; version = "11"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU="; }; doCheck = true; nativeCheckInputs = [ python3 ]; # these tests cover use as a build-time-linked library - checkPhase = '' - make test - ''; + checkTarget = "test"; installPhase = '' install -Dm444 -t $out/include include/* @@ -38,8 +36,8 @@ lib.fix (self: stdenv.mkDerivation rec { passthru = { ld-preload-tests = stdenv.mkDerivation { - name = "${self.name}-ld-preload-tests"; - src = self.src; + name = "${finalAttrs.pname}-ld-preload-tests"; + inherit (finalAttrs) src; nativeBuildInputs = [ makeWrapper ]; @@ -66,13 +64,13 @@ lib.fix (self: stdenv.mkDerivation rec { ''; }; tests = { - ld-preload = runCommand "ld-preload-test-run" {} '' - ${self}/bin/preload-hardened-malloc ${self.ld-preload-tests}/bin/run-tests + ld-preload = runCommand "ld-preload-test-run" { } '' + ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${finalAttrs.passthru.ld-preload-tests}/bin/run-tests touch $out ''; # to compensate for the lack of tests of correct normal malloc operation - stress = runCommand "stress-test-run" {} '' - ${self}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ + stress = runCommand "stress-test-run" { } '' + ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ --no-rand-seed \ --malloc 8 \ --malloc-ops 1000000 \ |