git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #99239 from edolstra/emacs-closure

emacs: Remove references from emacs.pdmp

commitff9d09b8e004ed870ae0f3a5d039900608bddcec authoradisbladis <adisbladis@gmail.com> dateThu 1 Oct 2020, 13:35 (6 years ago) parent43f09cb8e13d34
1 file changed+5−2
pkgs/applications/editors/emacs/generic.nix+5−2
pkgs/applications/editors/emacs/generic.nix+5−2
@@ -11,7 +11,7 @@
1111, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
1212, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
1313, jansson, harfbuzz
14−, libgccjit, targetPlatform, makeWrapper # native-comp params
14+, libgccjit, targetPlatform, makeWrapper, nukeReferences # native-comp params
1515, systemd ? null
1616, withX ? !stdenv.isDarwin
1717, withNS ? stdenv.isDarwin
@@ -91,7 +91,7 @@ in stdenv.mkDerivation {
9191
9292 LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else "";
9393
94− nativeBuildInputs = [ pkgconfig makeWrapper ]
94+ nativeBuildInputs = [ pkgconfig makeWrapper nukeReferences ]
9595 ++ lib.optionals srcRepo [ autoreconfHook texinfo ]
9696 ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
9797
@@ -140,6 +140,9 @@ in stdenv.mkDerivation {
140140
141141 rm -rf $out/var
142142 rm -rf $siteVersionDir
143+
144+ nuke-refs $out/libexec/emacs/*/*/emacs.pdmp
145+
143146 '' + lib.optionalString withCsrc ''
144147 for srcdir in src lisp lwlib ; do
145148 dstdir=$siteVersionDir/$srcdir