dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into x-updates (to fix qt5 build)

Browse Source
This commit is contained in:
Vladimír Čunát 2014-01-28 11:40:08 +01:00
commit dfed4ad5d4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/default.nix
View File

@ -145,7 +145,7 @@ stdenv.mkDerivation rec {
postInstall = if buildDocs then "make docs&&make install_docs" else ""; postInstall = if buildDocs then "make docs&&make install_docs" else "";
enableParallelBuilding = true; #enableParallelBuilding = true; # often fails on Hydra, as well as qt4
meta = { meta = {
homepage = http://qt-project.org; homepage = http://qt-project.org;

2
pkgs/development/tools/misc/gdb/default.nix
View File

@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
license = "GPLv3+"; license = "GPLv3+";
platforms = with platforms; linux ++ cygwin; platforms = with platforms; linux ++ cygwin ++ darwin;
maintainers = with maintainers; [ pierron ]; maintainers = with maintainers; [ pierron ];
}; };
} }