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.
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, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr
+{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
 , xinput, curl, openssl, unzip }:

 with stdenv.lib;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
  '';

  buildInputs = [
-    cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl
+    cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl
  ];

  installPhase = ''