mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Merge pull request #170467 from adisbladis/emacs-from-git

Browse source 
emacs: Build from git instead of tarball to fix native compilation
This commit is contained in:
adisbladis 2022-04-27 03:19:40 +07:00 committed by GitHub
parent 69d1acda00 54e795706d
commit 1651000b71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/editors/emacs/28.nix
View file

@ -1,5 +1,5 @@
import ./generic.nix (rec {
version = "28.1";
sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=";
sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY=";
patches = _: [ ];
})

8
pkgs/applications/editors/emacs/generic.nix
View file

@ -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;
};