summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-02-14 10:14:34 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-02-14 10:14:34 +0000
commit1566609a1ac00a7112dc87f46ff7f14c28ba1931 (patch)
tree4d523b4a31866c09dc623181e6bf65b3d9cd57ed /pkgs
parent8c58edf34dcba6f172e971d9823fefa5a3641a72 (diff)
downloadnixlib-1566609a1ac00a7112dc87f46ff7f14c28ba1931.tar
nixlib-1566609a1ac00a7112dc87f46ff7f14c28ba1931.tar.gz
nixlib-1566609a1ac00a7112dc87f46ff7f14c28ba1931.tar.bz2
nixlib-1566609a1ac00a7112dc87f46ff7f14c28ba1931.tar.lz
nixlib-1566609a1ac00a7112dc87f46ff7f14c28ba1931.tar.xz
nixlib-1566609a1ac00a7112dc87f46ff7f14c28ba1931.tar.zst
nixlib-1566609a1ac00a7112dc87f46ff7f14c28ba1931.zip
* libXft: propagate libXrender.
svn path=/nixpkgs/branches/x-updates/; revision=25950
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 85c199325508..5be23d391c81 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -89,8 +89,9 @@ in
   };
   
   libXft = attrs: attrs // {
-    buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11
-        xorg.renderproto ];
+    buildInputs = attrs.buildInputs ++
+      [ xorg.xproto xorg.libX11 xorg.renderproto ];
+    propagatedBuildInputs = [ xorg.libXrender ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };