nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-13 01:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96513 from delroth/patchelf-0.12

Browse Source 
patchelf: 0.11 -> 0.12
This commit is contained in:
Eelco Dolstra 2020-08-28 10:01:36 +02:00 committed by GitHub
commit 424fd11769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/mesa/default.nix
View File

@ -4,7 +4,6 @@
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, python3Packages , libelf, libvdpau, python3Packages
, libglvnd , libglvnd
, patchelf, autoreconfHook, fetchFromGitHub
, enableRadv ? true , enableRadv ? true
, galliumDrivers ? ["auto"] , galliumDrivers ? ["auto"]
, driDrivers ? ["auto"] , driDrivers ? ["auto"]
@ -148,16 +147,6 @@ stdenv.mkDerivation {
depsBuildBuild = [ pkgconfig ]; depsBuildBuild = [ pkgconfig ];
nativeBuildInputs = [ 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 pkgconfig meson ninja
intltool bison flex file intltool bison flex file
python3Packages.python python3Packages.Mako python3Packages.python python3Packages.Mako

7
pkgs/development/tools/misc/patchelf/default.nix
View File

@ -6,11 +6,12 @@
# files. # files.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "patchelf-0.11"; pname = "patchelf";
version = "0.12";
src = fetchurl { src = fetchurl {
url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9";
}; };
setupHook = [ ./setup-hook.sh ]; setupHook = [ ./setup-hook.sh ];