Commit 54e79570 authored by adisbladis's avatar adisbladis
Browse files

emacs: Build from git instead of tarball to fix native compilation 

Quoting @collares from #170426:
> The difference between the two versions is that one is built from the
> tarball, while the other is built from Git. The tarball includes
> byte-compiled (.elc) files but not native-compiled (.eln)
> files. The build notices the .elc files and does not rebuild them,
> but native-compilation is a side-effect of byte-compilation and so
> the .eln files aren't built either.
parent a5282b8b

pkgs/applications/editors/emacs/28.nix

+1 −1
Original line number Diff line number Diff line 
import ./generic.nix (rec {

  version = "28.1";

  sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=";

  sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY=";

  patches = _: [ ];

})

pkgs/applications/editors/emacs/generic.nix

+5 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
, sigtool, jansson, harfbuzz, sqlite, nixosTests

, dontRecurseIntoAttrs, emacsPackagesFor

, libgccjit, targetPlatform, makeWrapper # native-comp params

, fetchFromSavannah

, systemd ? null

, withX ? !stdenv.isDarwin

, withNS ? stdenv.isDarwin
@@ -23,7 +24,7 @@ 
, withSQLite3 ? false

, withCsrc ? true

, withWebP ? false

, srcRepo ? false, autoreconfHook ? null, texinfo ? null

, srcRepo ? true, autoreconfHook ? null, texinfo ? null

, siteStart ? ./site-start.el

, nativeComp ? false

, withAthena ? false
@@ -59,8 +60,9 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { 


  patches = patches fetchpatch;



  src = fetchurl {

    url = "mirror://gnu/emacs/${name}.tar.xz";

  src = fetchFromSavannah {

    repo = "emacs";

    rev = version;

    inherit sha256;

  };