diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-14 10:04:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-14 10:04:37 +0000 |
| commit | 47aa6890d2b563a1c068fc953488b8f436f30d64 (patch) | |
| tree | 89c17722b959298f10ee02f99aa0a6b149de0cb3 /pkgs/servers/x11/xorg/overrides.nix | |
| parent | a3f620c3cce707fa2032b3d77e1789dc2a96ea5f (diff) | |
| download | nixpkgs-47aa6890d2b563a1c068fc953488b8f436f30d64.tar nixpkgs-47aa6890d2b563a1c068fc953488b8f436f30d64.tar.gz nixpkgs-47aa6890d2b563a1c068fc953488b8f436f30d64.tar.bz2 nixpkgs-47aa6890d2b563a1c068fc953488b8f436f30d64.tar.lz nixpkgs-47aa6890d2b563a1c068fc953488b8f436f30d64.tar.xz nixpkgs-47aa6890d2b563a1c068fc953488b8f436f30d64.tar.zst nixpkgs-47aa6890d2b563a1c068fc953488b8f436f30d64.zip | |
* libXaw: propagates libXmu.
svn path=/nixpkgs/branches/x-updates/; revision=25948
Diffstat (limited to 'pkgs/servers/x11/xorg/overrides.nix')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2de499f943e..85c19932550 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -69,6 +69,8 @@ in }; # Propagate some build inputs because of header file dependencies. + # Note: most of these are in Requires.private, so maybe builder.sh + # should propagate them automatically. libXt = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; propagatedBuildInputs = [ xorg.libSM ]; @@ -82,6 +84,10 @@ in propagatedBuildInputs = [ xorg.libXfixes ]; }; + libXaw = attrs: attrs // { + propagatedBuildInputs = [ xorg.libXmu ]; + }; + libXft = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11 xorg.renderproto ]; |