diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:40 +0200 |
| commit | eb2e46aab26600484bfabb3c242bdd069279bdb1 (patch) | |
| tree | 18ec0523bfcd0967f8eef326756f96dc0075789a /pkgs/development/libraries/mesa | |
| parent | 16f45507619b4c4012bb7958fba09eb3bdc5ac87 (diff) | |
| parent | 22d4472d2744639ccd880f015bb3147cf5222f07 (diff) | |
| download | nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.gz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.bz2 nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.lz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.xz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.zst nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.zip | |
Merge branch 'master' into x-updates
Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a3945d776566..d2cf15b81a8b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext , libXt, udev, enableTextureFloats ? false, enableR600LlvmCompiler ? false , python, libxml2Python, autoconf, automake, libtool, llvm, writeText -, wayland }: +, libffi, wayland }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ autoconf automake libtool intltool expat libxml2Python udev llvm libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt - wayland + libffi wayland ]; nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; |