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 @@
{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }:
{ lib, stdenv, fetchurl, xlibsWrapper, SDL, mesa, openal, gcc46 }:
stdenv.mkDerivation {
name = "ioquake3-1.36";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
./botlib.patch
];
buildInputs = [ x11 SDL mesa openal gcc46 ];
buildInputs = [ xlibsWrapper SDL mesa openal gcc46 ];
# Fix building on GCC 4.6.
NIX_CFLAGS_COMPILE = "-Wno-error";