diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
| commit | 2ced89b7f14a817d0507747efa22bedaec10e423 (patch) | |
| tree | 84a7421d43e02c590b7828d0ab34f1b8e2b1fab5 /pkgs/applications/editors/emacs-23/default.nix | |
| parent | b1762c6b49f7fb6469a71e1b59b1f96fcc4dfef2 (diff) | |
| parent | ecea8900e7f7278b58d7604aa8a3d5a7ba65bc8f (diff) | |
| download | nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.gz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.bz2 nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.lz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.xz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.zst nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
Diffstat (limited to 'pkgs/applications/editors/emacs-23/default.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs-23/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 84a98182e9f5..a1a9aa4fa325 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -8,19 +8,19 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-23.3"; + name = "emacs-23.3b"; builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.bz2"; - sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a"; + sha256 = "1vp6qbbjgh5zpd87j3ggsvgf8q6cax8z3cdx3syv5v2662dapp46"; }; - buildInputs = + buildInputs = [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft gconf - ] + ] ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux dbus; |