diff options
author | John Wiegley <johnw@newartisans.com> | 2016-01-11 14:31:03 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 14:31:03 -0800 |
commit | 14c8a6f32debade73660eae7308271f714d021b2 (patch) | |
tree | 04d1f66bae8d84df65d316e5f59c96b60d99f52d /pkgs | |
parent | b7ff0301d6f26bd8419e888fd0e129f3dc8bd328 (diff) | |
download | nixpkgs-14c8a6f32debade73660eae7308271f714d021b2.tar nixpkgs-14c8a6f32debade73660eae7308271f714d021b2.tar.gz nixpkgs-14c8a6f32debade73660eae7308271f714d021b2.tar.bz2 nixpkgs-14c8a6f32debade73660eae7308271f714d021b2.tar.lz nixpkgs-14c8a6f32debade73660eae7308271f714d021b2.tar.xz nixpkgs-14c8a6f32debade73660eae7308271f714d021b2.tar.zst nixpkgs-14c8a6f32debade73660eae7308271f714d021b2.zip |
emacs24Macport: Further cleanups, remove old code
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/emacs-24/macport-24.3.nix | 98 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs-24/macport-24.4.nix | 101 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs-24/macport-24.5.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
4 files changed, 10 insertions, 214 deletions
diff --git a/pkgs/applications/editors/emacs-24/macport-24.3.nix b/pkgs/applications/editors/emacs-24/macport-24.3.nix deleted file mode 100644 index 191969eef5b..00000000000 --- a/pkgs/applications/editors/emacs-24/macport-24.3.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls -}: - -stdenv.mkDerivation rec { - emacsName = "emacs-24.3"; - name = "${emacsName}-mac-4.8"; - - #builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; - }; - - macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx"; - }; - - buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; - - postUnpack = '' - mv $emacsName $name - tar xzf $macportSrc - mv $name $emacsName - ''; - - preConfigure = '' - patch -p0 < patch-mac - - # The search for 'tputs' will fail because it's in ncursesw within the - # ncurses package, yet Emacs' configure script only looks in ncurses. - # Further, we need to make sure that the -L option occurs before mention - # of the library, so that it finds it within the Nix store. - sed -i 's/tinfo ncurses/tinfo ncursesw/' configure - ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g') - sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure - sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure - - configureFlagsArray=( - LDFLAGS=-L${ncurses}/lib - --with-xml2=yes - --with-gnutls=yes - --with-mac - --enable-mac-app=$out/Applications - ) - makeFlagsArray=( - CFLAGS=-O3 - LDFLAGS="-O3 -L${ncurses}/lib" - ); - ''; - - postInstall = '' - cat >$out/share/emacs/site-lisp/site-start.el <<EOF - ;; nixos specific load-path - (when (getenv "NIX_PROFILES") (setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (getenv "NIX_PROFILES")))) - load-path))) - - ;; make tramp work for NixOS machines - (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) - EOF - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "GNU Emacs 24, the extensible, customizable text editor"; - homepage = http://www.gnu.org/software/emacs/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley ]; - platforms = platforms.darwin; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - extensions are distributed with GNU Emacs; others are available - separately. - - This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later - 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 - don't need to try this. - ''; - }; -} diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix deleted file mode 100644 index b79ac6150ed..00000000000 --- a/pkgs/applications/editors/emacs-24/macport-24.4.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls -}: - -stdenv.mkDerivation rec { - emacsName = "emacs-24.4"; - name = "${emacsName}-mac-5.3"; - - #builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7"; - }; - - macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "0qzzqnql0z0a2p3ciccy8gq79v0s7s717lchcprn3wlaqcrk2g1p"; - }; - - buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; - - postUnpack = '' - mv $emacsName $name - tar xzf $macportSrc - mv $name $emacsName - ''; - - preConfigure = '' - substituteInPlace Makefile.in --replace "/bin/pwd" "pwd" - substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd" - - patch -p0 < patch-mac - - # The search for 'tputs' will fail because it's in ncursesw within the - # ncurses package, yet Emacs' configure script only looks in ncurses. - # Further, we need to make sure that the -L option occurs before mention - # of the library, so that it finds it within the Nix store. - sed -i 's/tinfo ncurses/tinfo ncursesw/' configure - ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g') - sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure - sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure - - configureFlagsArray=( - LDFLAGS=-L${ncurses}/lib - --with-xml2=yes - --with-gnutls=yes - --with-mac - --enable-mac-app=$out/Applications - ) - makeFlagsArray=( - CFLAGS=-O3 - LDFLAGS="-O3 -L${ncurses}/lib" - ); - ''; - - postInstall = '' - cat >$out/share/emacs/site-lisp/site-start.el <<EOF - ;; nixos specific load-path - (when (getenv "NIX_PROFILES") (setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (getenv "NIX_PROFILES")))) - load-path))) - - ;; make tramp work for NixOS machines - (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) - EOF - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "GNU Emacs 24, the extensible, customizable text editor"; - homepage = http://www.gnu.org/software/emacs/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley ]; - platforms = platforms.darwin; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - extensions are distributed with GNU Emacs; others are available - separately. - - This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later - 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 - don't need to try this. - ''; - }; -} diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index ed4c435c09b..c778c42de85 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls -, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit, gettext -, AppKit, GSS, ImageIO +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext +, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, ImageCaptureCore, GSS, ImageIO # These may be optional }: stdenv.mkDerivation rec { @@ -21,12 +21,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ - ncurses libxml2 gnutls pkgconfig texinfo gettext - ]; + buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext ]; propagatedBuildInputs = [ - Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit AppKit GSS ImageIO + AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit + ImageCaptureCore GSS ImageIO # may be optional ]; postUnpack = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01fef969bf3..04c33ff547a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11479,14 +11479,10 @@ let withGTK3 = false; })); - emacs24Macport_24_3 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.3.nix { - stdenv = pkgs.clangStdenv; - }); - emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix { - stdenv = pkgs.clangStdenv; - }); - emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix { - stdenv = pkgs.clangStdenv; + emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix { + inherit (darwin.apple_sdk.frameworks) + AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit + ImageCaptureCore GSS ImageIO; }); emacs24Macport = self.emacs24Macport_24_5; |