diff options
| author | Shea Levy <shea@shealevy.com> | 2012-07-14 14:24:27 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-07-14 14:24:27 -0400 |
| commit | c514ee974a14856ccabe0463e812c6bf2b7175a8 (patch) | |
| tree | 368562bed1d4cde7e30a431ba60cc796e7c10538 /pkgs/development/libraries/libdrm | |
| parent | 41840af6894bf718a1038ba1045adef26a687919 (diff) | |
| parent | 8ff20e5b77b7aea77b5bd22da3d2c10a99481b74 (diff) | |
| download | nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.gz nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.bz2 nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.lz nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.xz nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.zst nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.zip | |
Merge remote-tracking branch 'upstream/master' into x-updates
mountall conflict was trivial Conflicts: pkgs/os-specific/linux/mountall/default.nix
Diffstat (limited to 'pkgs/development/libraries/libdrm')
| -rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4cf4068ed5bb..3a1e101aa431 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ] + configureFlags = [ "--enable-nouveau-experimental-api" + "--enable-radeon-experimental-api" + "--enable-udev" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; |