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/pango/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz
, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isDarwin [ fontconfig ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
enableParallelBuilding = true;