public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacsMacport: change naming scheme 

Changed name from emacs-25.1-mac-6.1 to emacs-mac-25.1-6.1.
The former scheme confused compareVersions from nix and consequently
nix-env -u.
This commit is contained in:
Leon Isenberg 2017-03-24 22:16:39 +01:00
parent acb3135613
commit f20a10b451
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/emacs/macport.nix
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