diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-02 10:41:53 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-02 10:41:53 +0100 |
| commit | 26af997d41444e71074c41e82c2eb869b33758f1 (patch) | |
| tree | eb4f7fcc4a71a18c85452c927dedc9d9744ad21f /pkgs/servers/x11 | |
| parent | 97b24ed95acdd7ad4d7e94b94c0a6eaf3d5fa92a (diff) | |
| parent | a920c50cfbe849c9062de81bde050b5672e4e42c (diff) | |
| download | nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.gz nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.bz2 nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.lz nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.xz nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.zst nixlib-26af997d41444e71074c41e82c2eb869b33758f1.zip | |
Merge branch 'master' into stdenv-updates
Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 23600b0e0145..f26ba257c024 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1724,8 +1724,9 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2; sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + CFLAGS = "-I${pixman}/include/pixman-1"; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ;}; xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { name = "xf86-video-voodoo-1.2.4"; |