public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: replace its usage by xlibsWrapper directly

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/fltk/default.nix
View File

@@ -1,4 +1,4 @@
{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
let inherit (composableDerivation) edf; in
@@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec {
sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";
};
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];
buildInputs = [ pkgconfig ];

4
pkgs/development/libraries/fltk/fltk13.nix
View File

@@ -1,4 +1,4 @@
{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
, cfg ? {}
, automake, autoconf, libtool
@@ -21,7 +21,7 @@ composableDerivation.composableDerivation {} {
--replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
'';
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];
enableParallelBilding = true;