commit d2ef7ab10fcb77719823e6f0a703a07cd1aa194f · pyrox.dev/nixpkgs

+11 -18

pkgs/applications/editors/emacs-25/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d

     

       1
       1
       +
       { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d

     

       2
       2
        
       , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif

     

       3
       3
        
       , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls

     

       4
       4
       -
       , alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc

     

       4
       4
       +
       , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO

     

       5
       5
        
       , autoconf, automake

     

       6
       6
        
       , withX ? !stdenv.isDarwin

     

       7
       7
        
       , withGTK3 ? false, gtk3 ? null

     
···

       23
       23
        
       in

     

       24
       24
        
       

     

       25
       25
        
       stdenv.mkDerivation rec {

     

       26
       26
       -
         name = "emacs-25.0.50-1b5630e";

     

       26
       26
       +
         name = "emacs-25.0.92";

     

       27
       27
        
       

     

       28
       28
        
         builder = ./builder.sh;

     

       29
       29
        
       

     

       30
       30
       -
         src = fetchgit {

     

       31
       31
       -
           url = "git://git.savannah.gnu.org/emacs.git";

     

       32
       32
       -
           rev = "1b5630eb47d3f4bade09708c958ab006b83b3fc0";

     

       33
       33
       -
           sha256 = "0n3qbri84akmy7ad1pbv89j4jn4x9pnkz0p4nbhh6m1c37cbz58l";

     

       30
       30
       +
         src = fetchurl {

     

       31
       31
       +
           url = "ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-25.0.92.tar.xz";

     

       32
       32
       +
           sha256 = "13jnj1js2l90k4yk219r3z67fff90r6mniprsp0sgip2kaak75y2";

     

       34
       33
        
         };

     

       35
       34
        
       

     

       36
       36
       -
         patches = stdenv.lib.optionals stdenv.isDarwin [

     

       35
       35
       +
         patches = lib.optionals stdenv.isDarwin [

     

       37
       36
        
           ./at-fdcwd.patch

     

       38
       37
        
         ];

     

       39
       38
        
       

     
···

       52
       51
        
           ++ stdenv.lib.optional (withX && withGTK3) gtk3

     

       53
       52
        
           ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;

     

       54
       53
        
       

     

       55
       55
       -
         propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc

     

       56
       56
       -
         ];

     

       57
       57
       -
       

     

       58
       58
       -
         NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin

     

       59
       59
       -
           "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";

     

       54
       54
       +
         propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];

     

       60
       55
        
       

     

       61
       56
        
         configureFlags =

     

       62
       57
        
           if stdenv.isDarwin

     
···

       81
       76
        
           mv nextstep/Emacs.app $out/Applications

     

       82
       77
        
         '';

     

       83
       78
        
       

     

       84
       84
       -
         doCheck = !stdenv.isDarwin;

     

       79
       79
       +
         # https://github.com/NixOS/nixpkgs/issues/13573

     

       80
       80
       +
         doCheck = false;

     

       85
       81
        
       

     

       86
       82
        
         meta = with stdenv.lib; {

     

       87
       83
        
           description = "GNU Emacs 25 (pre), the extensible, customizable text editor";

     

       88
       84
        
           homepage    = http://www.gnu.org/software/emacs/;

     

       89
       85
        
           license     = licenses.gpl3Plus;

     

       90
       90
       -
           maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ];

     

       86
       86
       +
           maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];

     

       91
       87
        
           platforms   = platforms.all;

     

       92
       92
       -
       

     

       93
       93
       -
           # So that Exuberant ctags is preferred

     

       94
       94
       -
           priority = 1;

     

       95
       88
        
       

     

       96
       89
        
           longDescription = ''

     

       97
       90
        
             GNU Emacs is an extensible, customizable text editor—and more.  At its

+1 -2

pkgs/top-level/all-packages.nix

···

       11990
       11990
        
           imagemagick = null;

     

       11991
       11991
        
           acl = null;

     

       11992
       11992
        
           gpm = null;

     

       11993
       11993
       -
           inherit (darwin.apple_sdk.frameworks) AppKit Foundation;

     

       11994
       11994
       -
           inherit (darwin) libobjc;

     

       11993
       11993
       +
           inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;

     

       11995
       11994
        
         });

     

       11996
       11995
        
       

     

       11997
       11996
        
         emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {