ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 18:17:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge #221900: emacs: use patchelf_0_15 to avoid upstream bug

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-03-19 10:03:55 +01:00
commit ce7e136b6a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/generic.nix
View File

@ -15,6 +15,7 @@
, recurseIntoAttrs, emacsPackagesFor
, libgccjit, makeWrapper # native-comp params
, fetchFromSavannah, fetchFromBitbucket
, patchelf_0_15
# macOS dependencies for NS and macPort
, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
@ -136,6 +137,9 @@ assert withTreeSitter -> tree-sitter != null;
];
nativeBuildInputs = [ pkg-config makeWrapper ]
# TODO: remove once it's fixed upstream and released:
# https://github.com/NixOS/patchelf/issues/482
++ [ patchelf_0_15 ]
++ lib.optionals (srcRepo || withMacport) [ texinfo ]
++ lib.optionals srcRepo [ autoreconfHook ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;

36
pkgs/development/tools/misc/patchelf/0.15.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib, stdenv, fetchurl }:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
stdenv.mkDerivation rec {
pname = "patchelf";
version = "0.15.0";
src = fetchurl {
url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-9ANtPuTY4ijewb7/8PbkbYpA6eVw4AaOOdd+YuLIvcI=";
};
strictDeps = true;
setupHook = [ ./setup-hook.sh ];
enableParallelBuilding = true;
# fails 8 out of 24 tests, problems when loading libc.so.6
doCheck = stdenv.name == "stdenv-linux"
# test scripts require unprefixed bintools binaries
# https://github.com/NixOS/patchelf/issues/417
&& stdenv.cc.targetPrefix == "";
meta = with lib; {
homepage = "https://github.com/NixOS/patchelf";
license = licenses.gpl3Plus;
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ maintainers.eelco ];
platforms = platforms.all;
};
}

5
pkgs/top-level/all-packages.nix
View File

@ -18563,6 +18563,11 @@ with pkgs;
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
patchelf = patchelfStable;
};
# used by emacs which is not compatible to 0.17.2 release:
# https://github.com/NixOS/patchelf/issues/482
patchelf_0_15 = callPackage ../development/tools/misc/patchelf/0.15.nix { };
patchelfStable = callPackage ../development/tools/misc/patchelf { };
patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });