Merge pull request #95601 from NixOS/f/emacs
emacs: use autoreconfHook instead of manually invoking it
This commit is contained in:
commit
0c86b65ef1
|
@ -11,7 +11,7 @@
|
||||||
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
|
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
|
||||||
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
|
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
|
||||||
, withCsrc ? true
|
, withCsrc ? true
|
||||||
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
|
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
|
||||||
, siteStart ? ./site-start.el
|
, siteStart ? ./site-start.el
|
||||||
, nativeComp ? false
|
, nativeComp ? false
|
||||||
, toolkit ? (
|
, toolkit ? (
|
||||||
|
@ -56,6 +56,15 @@ in stdenv.mkDerivation {
|
||||||
rm -fr .git
|
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
|
# Make native compilation work both inside and outside of nix build
|
||||||
(lib.optionalString nativeComp (let
|
(lib.optionalString nativeComp (let
|
||||||
libPath = lib.concatStringsSep ":" [
|
libPath = lib.concatStringsSep ":" [
|
||||||
|
@ -78,7 +87,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 ]
|
||||||
++ lib.optionals srcRepo [ autoconf automake texinfo ]
|
++ lib.optionals srcRepo [ autoreconfHook texinfo ]
|
||||||
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
|
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -114,17 +123,6 @@ in stdenv.mkDerivation {
|
||||||
++ lib.optional nativeComp "--with-nativecomp"
|
++ 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" ];
|
installTargets = [ "tags" "install" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
Loading…
Reference in a new issue