diff options
| author | Patrick Wheeler <Patrick.John.Wheeler@gmail.com> | 2013-03-02 01:08:33 +0100 |
|---|---|---|
| committer | Patrick Wheeler <Patrick.John.Wheeler@gmail.com> | 2013-03-02 01:08:33 +0100 |
| commit | 8cdfd46d96b0b6da503f645e4a6fccd60442b0b6 (patch) | |
| tree | ab047de53f2e5be566b35f8c1c98c16739968ae3 /pkgs/servers/x11/xorg/default.nix | |
| parent | 089fd0a76912b554fa83710442645060706417c9 (diff) | |
| download | nixpkgs-8cdfd46d96b0b6da503f645e4a6fccd60442b0b6.tar nixpkgs-8cdfd46d96b0b6da503f645e4a6fccd60442b0b6.tar.gz nixpkgs-8cdfd46d96b0b6da503f645e4a6fccd60442b0b6.tar.bz2 nixpkgs-8cdfd46d96b0b6da503f645e4a6fccd60442b0b6.tar.lz nixpkgs-8cdfd46d96b0b6da503f645e4a6fccd60442b0b6.tar.xz nixpkgs-8cdfd46d96b0b6da503f645e4a6fccd60442b0b6.tar.zst nixpkgs-8cdfd46d96b0b6da503f645e4a6fccd60442b0b6.zip | |
Fix xf86vmware fix
Moved xf86vmware fix into the overrides.nix file where and not in the generated default.nix.
Diffstat (limited to 'pkgs/servers/x11/xorg/default.nix')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f26ba257c02..23600b0e014 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1724,9 +1724,8 @@ let url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2; sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"; }; - 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 ;}; + 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 ;}; xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { name = "xf86-video-voodoo-1.2.4"; |