diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-17 10:17:49 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-17 10:17:49 +0000 |
| commit | a9633d80decd1ccf2f572141fb985bc0901ada07 (patch) | |
| tree | bcbba72f81d3f3cba71288aa67bf6fe77e6dcf89 /pkgs | |
| parent | 9b6dfe840a2a2e9a209497b1d293ff401bec390a (diff) | |
| download | nixlib-a9633d80decd1ccf2f572141fb985bc0901ada07.tar nixlib-a9633d80decd1ccf2f572141fb985bc0901ada07.tar.gz nixlib-a9633d80decd1ccf2f572141fb985bc0901ada07.tar.bz2 nixlib-a9633d80decd1ccf2f572141fb985bc0901ada07.tar.lz nixlib-a9633d80decd1ccf2f572141fb985bc0901ada07.tar.xz nixlib-a9633d80decd1ccf2f572141fb985bc0901ada07.tar.zst nixlib-a9633d80decd1ccf2f572141fb985bc0901ada07.zip | |
* Emacs: don't depend on dbus on non-Linux platforms.
svn path=/nixpkgs/branches/x-updates/; revision=26007
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs-23/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 4bdb4f132c2f..f550d3d69875 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z"; }; - buildInputs = [ - ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif - libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf - ]; + 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; configureFlags = stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ]; |