Merge pull request #58715 from booxter/patchelf-version-bump
Bump patchelf and patchelfUnstable to 0.10
This commit is contained in:
commit
41ad32febe
|
@ -1,16 +1,27 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "patchelf-0.9";
|
||||
name = "patchelf-${version}";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
|
||||
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
|
||||
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;
|
||||
|
|
|
@ -1,24 +1,18 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
{ stdenv, fetchurl, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "patchelf";
|
||||
version = "0.10-pre-20190328";
|
||||
name = "patchelf-${version}";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "patchelf";
|
||||
rev = "e1e39f3639e39360ceebb2f7ed533cede4623070";
|
||||
sha256 = "09q1b1yqfzg1ih51v7qjh55vxfdbd8x5anycl8sfz6qy107wr02k";
|
||||
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" ""
|
||||
'' +
|
||||
# extend version identifier to more informative than "0.10".
|
||||
''
|
||||
echo -n ${version} > version
|
||||
'';
|
||||
|
||||
setupHook = [ ./setup-hook.sh ];
|
||||
|
@ -28,11 +22,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://nixos.org/patchelf.html;
|
||||
license = "GPL";
|
||||
license = licenses.gpl3;
|
||||
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ maintainers.eelco ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue