diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-08-16 23:28:05 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2020-08-16 23:28:05 +0800 |
| commit | 5230f07301d417d7f99a9ab478e4b3036500a3ad (patch) | |
| tree | 9631328b9b7fc97efa818668152e8fd8647b5322 | |
| parent | Merge pull request #91555 from r-ryantm/auto-update/elementary-xfce-icon-theme (diff) | |
| download | nixpkgs-origin/f/emacs.tar.gz | |
emacs: use autoreconfHook instead of manually invoking itorigin/f/emacs
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 1bfe9be6175b..efdaaaf055f6 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -11,7 +11,7 @@ , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true -, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null +, srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false , toolkit ? ( @@ -56,6 +56,15 @@ in stdenv.mkDerivation { rm -fr .git '') + '' + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale + + for makefile_in in $(find . -name Makefile.in -print); do + substituteInPlace $makefile_in --replace /bin/pwd pwd + done + '' + # Make native compilation work both inside and outside of nix build (lib.optionalString nativeComp (let libPath = lib.concatStringsSep ":" [ @@ -78,7 +87,7 @@ in stdenv.mkDerivation { LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else ""; nativeBuildInputs = [ pkgconfig makeWrapper ] - ++ lib.optionals srcRepo [ autoconf automake texinfo ] + ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; buildInputs = @@ -114,17 +123,6 @@ in stdenv.mkDerivation { ++ lib.optional nativeComp "--with-nativecomp" ; - preConfigure = lib.optionalString srcRepo '' - ./autogen.sh - '' + '' - substituteInPlace lisp/international/mule-cmds.el \ - --replace /usr/share/locale ${gettext}/share/locale - - for makefile_in in $(find . -name Makefile.in -print); do - substituteInPlace $makefile_in --replace /bin/pwd pwd - done - ''; - installTargets = [ "tags" "install" ]; postInstall = '' |