public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into x-updates

Browse Source 
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
This commit is contained in:
Shea Levy
2012-07-14 14:24:27 -04:00
parent 41840af689 8ff20e5b77
commit c514ee974a
581 changed files with 9707 additions and 7420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libdrm/default.nix
+3 -1
View File
@@ -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" ];