From 0611b32e9250fd47c0fb8ef59645381d4c9a6f2a Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 1 Apr 2019 09:28:55 -0700 Subject: patchelf: fixed tests for musl The recipe is copied from patchelfUnstable. --- pkgs/development/tools/misc/patchelf/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'pkgs/development/tools/misc/patchelf/default.nix') diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 355d3979822..db8bb4f4243 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,16 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "patchelf-0.10"; + name = "patchelf-${version}"; + version = "0.10"; src = fetchurl { url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n"; }; + # Drop test that fails on musl (?) + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace tests/Makefile.am \ + --replace "set-rpath-library.sh" "" + ''; + setupHook = [ ./setup-hook.sh ]; - doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; + + # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6 + doCheck = stdenv.hostPlatform.isMusl; meta = with stdenv.lib; { homepage = https://nixos.org/patchelf.html; -- cgit 1.4.1