diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:13:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:08:24 +0200 |
commit | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch) | |
tree | a23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs/development/libraries/pango | |
parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) | |
download | nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2 nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.zip |
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.
Diffstat (limited to 'pkgs/development/libraries/pango')
-rw-r--r-- | pkgs/development/libraries/pango/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 87187667a92..2db67041ec3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -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; |