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
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, expat, x11, freetype }:
{ stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }:
# !!! assert freetype == xlibs.freetype
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
};
buildInputs = [ perl expat x11 freetype ];
buildInputs = [ perl expat xlibsWrapper freetype ];
# Zoom doesn't add the right directory in the include path.
CFLAGS = [ "-I" (freetype + "/include/freetype2") ];