Merge pull request #24303 from ljli/emacs-mac

emacsMacport: name change and description
This commit is contained in:
Daiderd Jordan 2017-03-27 21:51:13 +02:00 committed by GitHub
commit c476cc3c3d

View File

@ -4,8 +4,10 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
emacsName = "emacs-25.1"; emacsVersion = "25.1";
name = "${emacsName}-mac-6.1"; emacsName = "emacs-${emacsVersion}";
macportVersion = "6.1";
name = "emacs-mac-${emacsVersion}-${macportVersion}";
builder = ./builder.sh; builder = ./builder.sh;
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
}; };
macportSrc = fetchurl { macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62"; sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
}; };
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
postUnpack = '' postUnpack = ''
mv $sourceRoot $name mv $sourceRoot $name
tar xzf $macportSrc tar xzf $macportSrc -C $name --strip-components=1
mv $name $sourceRoot mv $name $sourceRoot
# extract retina image resources # extract retina image resources
@ -92,8 +94,8 @@ stdenv.mkDerivation rec {
extensions are distributed with GNU Emacs; others are available extensions are distributed with GNU Emacs; others are available
separately. separately.
This is "Mac port" addition to GNU Emacs 24. This provides a native This is "Mac port" addition to GNU Emacs 25. This provides a native
GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later
already contain the official GUI support via the NS (Cocoa) port for already contain the official GUI support via the NS (Cocoa) port for
Mac OS X 10.4 and later. So if it is good enough for you, then you Mac OS X 10.4 and later. So if it is good enough for you, then you
don't need to try this. don't need to try this.