mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 16:23:26 +00:00
Merge pull request #96513 from delroth/patchelf-0.12
patchelf: 0.11 -> 0.12
This commit is contained in:
commit
424fd11769
@ -4,7 +4,6 @@
|
||||
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
|
||||
, libelf, libvdpau, python3Packages
|
||||
, libglvnd
|
||||
, patchelf, autoreconfHook, fetchFromGitHub
|
||||
, enableRadv ? true
|
||||
, galliumDrivers ? ["auto"]
|
||||
, driDrivers ? ["auto"]
|
||||
@ -148,16 +147,6 @@ stdenv.mkDerivation {
|
||||
depsBuildBuild = [ pkgconfig ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
(patchelf.overrideAttrs (pa: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "patchelf";
|
||||
rev = "61bc10176"; # current master; what matters is merge of #225
|
||||
sha256 = "0cy77mn77w3mn64ggp20f4ygnbxfjmddhjjhfwkva53lsirg6w93";
|
||||
};
|
||||
nativeBuildInputs = pa.nativeBuildInputs or [] ++ [ autoreconfHook ];
|
||||
}))
|
||||
] ++ [
|
||||
pkgconfig meson ninja
|
||||
intltool bison flex file
|
||||
python3Packages.python python3Packages.Mako
|
||||
|
@ -6,11 +6,12 @@
|
||||
# files.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "patchelf-0.11";
|
||||
pname = "patchelf";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2";
|
||||
sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx";
|
||||
url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9";
|
||||
};
|
||||
|
||||
setupHook = [ ./setup-hook.sh ];
|
||||
|
Loading…
Reference in New Issue
Block a user