public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45449 from dtzWill/update/patchelf-0.10-pre-2018-05-09 

patchelf: 0.10-pre-20180108 -> 0.10-pre-20180509, minor touchup
This commit is contained in:
xeji 2018-09-28 12:09:34 +02:00 committed by GitHub
parent eeac44c81a 7bf9b4256e
commit 487f7f458a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/misc/patchelf/unstable.nix
View File

@ -1,19 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook }: { stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "patchelf-0.10-pre-20180108"; name = "patchelf-${version}";
version = "0.10-pre-20180509";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "patchelf"; repo = "patchelf";
rev = "48452cf6b4ccba1c1f47a09f4284a253634ab7d1"; rev = "27ffe8ae871e7a186018d66020ef3f6162c12c69";
sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb"; sha256 = "1sfkqsvwqqm2kdgkiddrxni86ilbrdw5my29szz81nj1m2j16asr";
}; };
# Drop test that fails on musl (?) # Drop test that fails on musl (?)
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace tests/Makefile.am \ substituteInPlace tests/Makefile.am \
--replace "set-rpath-library.sh" "" --replace "set-rpath-library.sh" ""
'' +
# extend version identifier to more informative than "0.10".
''
echo -n ${version} > version
''; '';
setupHook = [ ./setup-hook.sh ]; setupHook = [ ./setup-hook.sh ];
@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ]; buildInputs = [ ];
doCheck = true; doCheck = !stdenv.isDarwin;
meta = { meta = {
homepage = https://nixos.org/patchelf.html; homepage = https://nixos.org/patchelf.html;