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/networking/browsers/w3m | |
| parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) | |
| download | nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2 nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst nixpkgs-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/networking/browsers/w3m')
| -rw-r--r-- | pkgs/applications/networking/browsers/w3m/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index ade28b519bc..d8c421af46a 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -3,12 +3,12 @@ , graphicsSupport ? false , mouseSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, x11 ? null, fbcon ? null +, imlib2 ? null, xlibsWrapper ? null, fbcon ? null , gpm-ncurses ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); +assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null); assert mouseSupport -> gpm-ncurses != null; stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional mouseSupport gpm-ncurses - ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; + ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon]; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; |