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.
This commit is contained in:
Vladimír Čunát
2015-09-15 12:08:24 +02:00
parent 47ad941fbf
commit 21e3ff658a
83 changed files with 183 additions and 187 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl
{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl
, spidermonkey, gpm
, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2
, enablePython ? false, python ? null
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ];
buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]
++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python;