diff options
author | Peter Simons <simons@cryp.to> | 2010-05-14 09:54:31 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2010-05-14 09:54:31 +0000 |
commit | 8f8b0bc3ad80011ea5ec77db21dcab8e2953d700 (patch) | |
tree | 4ad498a59f0ef95b8f211a718d6f0ddeff135693 | |
parent | b5feb272d75f8e85f1d85b65b6394e02d7f37ec6 (diff) | |
download | nixlib-8f8b0bc3ad80011ea5ec77db21dcab8e2953d700.tar nixlib-8f8b0bc3ad80011ea5ec77db21dcab8e2953d700.tar.gz nixlib-8f8b0bc3ad80011ea5ec77db21dcab8e2953d700.tar.bz2 nixlib-8f8b0bc3ad80011ea5ec77db21dcab8e2953d700.tar.lz nixlib-8f8b0bc3ad80011ea5ec77db21dcab8e2953d700.tar.xz nixlib-8f8b0bc3ad80011ea5ec77db21dcab8e2953d700.tar.zst nixlib-8f8b0bc3ad80011ea5ec77db21dcab8e2953d700.zip |
pkgs/applications/editors/emacs-{22,23}: don't restrict this build to Linux
It looks like the recent update broke the package on all platforms other than Linux, but no-one seems to have noticed. Hydra certainly didn't. That's not particularly satisfactory. Surely, we would like Emacs to build on Darwin, BSD, and other platforms, too? svn path=/nixpkgs/trunk/; revision=21773
-rw-r--r-- | pkgs/applications/editors/emacs-22/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs-23/default.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix index da3c4babbf6b..89c8af070e09 100644 --- a/pkgs/applications/editors/emacs-22/default.nix +++ b/pkgs/applications/editors/emacs-22/default.nix @@ -16,17 +16,17 @@ stdenv.mkDerivation rec { name = "emacs-22.3"; builder = ./builder.sh; - + src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.gz"; sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv"; }; - + buildInputs = [ncurses x11] ++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw) ++ stdenv.lib.optional xpmSupport libXpm ++ stdenv.lib.optionals gtkGUI [pkgconfig gtk]; - + configureFlags = stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk"; @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/emacs/; license = "GPLv3+"; - platforms = stdenv.lib.platforms.linux; # GTK & co. are needed. + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index fac7abadcb44..a68cd5935c5a 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; # GTK & co. are needed. + platforms = stdenv.lib.platforms.all; }; } |