public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #99239 from edolstra/emacs-closure

Browse Source 
emacs: Remove references from emacs.pdmp
This commit is contained in:
adisbladis 2020-10-01 13:35:06 +02:00 committed by GitHub
commit ff9d09b8e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz , jansson, harfbuzz
, libgccjit, targetPlatform, makeWrapper # native-comp params , libgccjit, targetPlatform, makeWrapper, nukeReferences # native-comp params
, systemd ? null , systemd ? null
, withX ? !stdenv.isDarwin , withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin , withNS ? stdenv.isDarwin
@ -91,7 +91,7 @@ in stdenv.mkDerivation {
LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else ""; LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else "";
nativeBuildInputs = [ pkgconfig makeWrapper ] nativeBuildInputs = [ pkgconfig makeWrapper nukeReferences ]
++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optionals srcRepo [ autoreconfHook texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
@ -140,6 +140,9 @@ in stdenv.mkDerivation {
rm -rf $out/var rm -rf $out/var
rm -rf $siteVersionDir rm -rf $siteVersionDir
nuke-refs $out/libexec/emacs/*/*/emacs.pdmp
'' + lib.optionalString withCsrc '' '' + lib.optionalString withCsrc ''
for srcdir in src lisp lwlib ; do for srcdir in src lisp lwlib ; do
dstdir=$siteVersionDir/$srcdir dstdir=$siteVersionDir/$srcdir