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:41:13 +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

2
pkgs/data/misc/gsettings-desktop-schemas/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
buildInputs = [ glib ];
buildNativeInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) maintainers platforms;

2
pkgs/data/misc/xkeyboard-config/default.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext ];
buildNativeInputs = [ perl perlXMLParser intltool xkbcomp ];
nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ];
patches = [ ./eo.patch ];