mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity

Revert "emacs: Remove references from emacs.pdmp"

Browse source 
This reverts commit 8e13d34944.

It turns out this breaks the build of emacsGit from the nix-community overlay.
This commit is contained in:
adisbladis 2020-10-06 01:02:00 +02:00
parent e0c48efc17
commit 14154fea52
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
1 changed files with 2 additions and 5 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
, 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