diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:43:02 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:47:36 +0200 |
commit | 4e5b465052f4c41fba9d23827a7085dc3f9bc7ee (patch) | |
tree | 5461f011980316b5cdd216ddd00b55d9c75c2963 | |
parent | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (diff) | |
download | nixpkgs-4e5b465052f4c41fba9d23827a7085dc3f9bc7ee.tar nixpkgs-4e5b465052f4c41fba9d23827a7085dc3f9bc7ee.tar.gz nixpkgs-4e5b465052f4c41fba9d23827a7085dc3f9bc7ee.tar.bz2 nixpkgs-4e5b465052f4c41fba9d23827a7085dc3f9bc7ee.tar.lz nixpkgs-4e5b465052f4c41fba9d23827a7085dc3f9bc7ee.tar.xz nixpkgs-4e5b465052f4c41fba9d23827a7085dc3f9bc7ee.tar.zst nixpkgs-4e5b465052f4c41fba9d23827a7085dc3f9bc7ee.zip |
patchelf: 0.10 -> 0.9 (downgrade!)
This is a partial revert of #58715. Bumping the default caused problems described in #69213. I tested that the vscode corruption happened even with the 0.10 pre-release, so I'm keeping patchelfUnstable on 0.10 (patchelfUnstable shouldn't cause a large rebuild anyway)
-rw-r--r-- | pkgs/development/tools/misc/patchelf/default.nix | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index db8bb4f4243..77d03f299f4 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,27 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; - version = "0.10"; + name = "patchelf-0.9"; src = fetchurl { url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "1wzwvnlyf853hw9zgqq5522bvf8gqadk8icgqa41a5n7593csw7n"; + sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; }; - # 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 ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ]; - - # if not Musl, fails 8 out of 25 tests, problems when loading libc.so.6 - doCheck = stdenv.hostPlatform.isMusl; + doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 meta = with stdenv.lib; { homepage = https://nixos.org/patchelf.html; |