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

Merge branch stdenv-updates into x-updates

Browse Source 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
This commit is contained in:
Vladimír Čunát
2013-02-21 12:43:00 +01:00
parent 0cddd5787f aacca1902c
commit 0d72174dbd
609 changed files with 5410 additions and 7636 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/misc/tulip/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ];
buildNativeInputs = [ cmake makeWrapper ];
nativeBuildInputs = [ cmake makeWrapper ];
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
doCheck = false;