diff options
| author | Jack Cummings <jack@mudshark.org> | 2013-01-10 21:35:13 -0800 |
|---|---|---|
| committer | Jack Cummings <jack@mudshark.org> | 2013-01-10 21:35:13 -0800 |
| commit | 42859e49ed643feca46263a6d12d4c93fdc7b2d7 (patch) | |
| tree | 5fab43f53d5ed783014940cf8fec5d6dbdbac174 /pkgs/os-specific | |
| parent | 2fd4313f6c13851f73e414a00ac8fb9457ae1674 (diff) | |
| parent | 6f1aad769f4dab42e9542c079fa43184388b074f (diff) | |
| download | nixlib-42859e49ed643feca46263a6d12d4c93fdc7b2d7.tar nixlib-42859e49ed643feca46263a6d12d4c93fdc7b2d7.tar.gz nixlib-42859e49ed643feca46263a6d12d4c93fdc7b2d7.tar.bz2 nixlib-42859e49ed643feca46263a6d12d4c93fdc7b2d7.tar.lz nixlib-42859e49ed643feca46263a6d12d4c93fdc7b2d7.tar.xz nixlib-42859e49ed643feca46263a6d12d4c93fdc7b2d7.tar.zst nixlib-42859e49ed643feca46263a6d12d4c93fdc7b2d7.zip | |
Merge remote-tracking branch 'upstream/master' into x86info.130109
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/xf86-video-nouveau/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix index e92b7f8003d8..876daa7a1ecb 100644 --- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto +, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman , utilmacros , libdrm , pkgconfig }: @@ -21,12 +21,14 @@ stdenv.mkDerivation { autoconf automake libtool - xorgserver xproto fontsproto xf86driproto renderproto videoproto + xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman utilmacros libdrm pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; + preConfigure = "autoreconf -vfi"; meta = { |