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 11:13:22 +02:00
parent 47ad941fbf
commit 21e3ff658a
83 changed files with 183 additions and 187 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu
{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
, libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:
stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
inherit xauth fontDirectories perl;
gcc = stdenv.cc.cc;
buildInputs = [ x11 zlib libjpeg imake gccmakedep libXmu libXaw
buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw
libXpm libXp xauth openssh ];
patchPhase = ''