From 14154fea5263b42b8ad982d7efe2061201f60f70 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 6 Oct 2020 01:02:00 +0200 Subject: [PATCH] Revert "emacs: Remove references from emacs.pdmp" This reverts commit 8e13d34944cfc70d17e246d1cbe878611fa93451. It turns out this breaks the build of emacsGit from the nix-community overlay. --- pkgs/applications/editors/emacs/generic.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index cc6b3d325f42..f2904f3e012b 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -11,7 +11,7 @@ , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz -, libgccjit, targetPlatform, makeWrapper, nukeReferences # native-comp params +, libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin @@ -91,7 +91,7 @@ in stdenv.mkDerivation { LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else ""; - nativeBuildInputs = [ pkgconfig makeWrapper nukeReferences ] + nativeBuildInputs = [ pkgconfig makeWrapper ] ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; @@ -140,9 +140,6 @@ in stdenv.mkDerivation { rm -rf $out/var rm -rf $siteVersionDir - - nuke-refs $out/libexec/emacs/*/*/emacs.pdmp - '' + lib.optionalString withCsrc '' for srcdir in src lisp lwlib ; do dstdir=$siteVersionDir/$srcdir