diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:13:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:08:24 +0200 |
commit | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch) | |
tree | a23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs/applications/editors/emacs-24 | |
parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) | |
download | nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2 nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.zip |
x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs before this set of refactoring. But that config wasn't even used by default.
Diffstat (limited to 'pkgs/applications/editors/emacs-24')
-rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 6c52a8991089..368b06b17e07 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d +{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX - [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK3) gtk3 |