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
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
stdenv.mkDerivation {
name = "Xaw3d-1.5E";
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
};
patches = [./config.patch ./laylex.patch];
buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex];
propagatedBuildInputs = [x11 libXmu];
buildInputs = [imake gccmakedep libXpm libXp bison flex];
propagatedBuildInputs = [xlibsWrapper libXmu];
meta = {
description = "3D widget set based on the Athena Widget set";