* Turn parallel building support on again (got lost somewhere...).
svn path=/nixpkgs/trunk/; revision=29035
This commit is contained in:
		
							parent
							
								
									9d1bee3245
								
							
						
					
					
						commit
						378009ff4a
					
				@ -30,6 +30,7 @@ rec {
 | 
				
			|||||||
      name = "${name}-${release}";
 | 
					      name = "${name}-${release}";
 | 
				
			||||||
      src = kdesrc name;
 | 
					      src = kdesrc name;
 | 
				
			||||||
      meta = defMeta // meta;
 | 
					      meta = defMeta // meta;
 | 
				
			||||||
 | 
					      enableParallelBuilding = true;
 | 
				
			||||||
    } // (removeAttrs a [ "meta" "name" ]));
 | 
					    } // (removeAttrs a [ "meta" "name" ]));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
 | 
					  # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
 | 
				
			||||||
@ -43,9 +44,13 @@ rec {
 | 
				
			|||||||
    stdenv.mkDerivation ({
 | 
					    stdenv.mkDerivation ({
 | 
				
			||||||
      name = "${name}-${release}";
 | 
					      name = "${name}-${release}";
 | 
				
			||||||
      src = kdesrc module;
 | 
					      src = kdesrc module;
 | 
				
			||||||
      cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
 | 
					      cmakeFlags =
 | 
				
			||||||
      "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
 | 
					        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
 | 
				
			||||||
 | 
					          "-DBUILD_doc=TRUE"
 | 
				
			||||||
 | 
					          "-DBUILD_${subdir}=TRUE"
 | 
				
			||||||
 | 
					        ] ++ cmakeFlags;
 | 
				
			||||||
      meta = defMeta // meta;
 | 
					      meta = defMeta // meta;
 | 
				
			||||||
 | 
					      enableParallelBuilding = true;
 | 
				
			||||||
    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
 | 
					    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # A KDE monolithic module
 | 
					  # A KDE monolithic module
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user