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

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
This commit is contained in:
Vladimír Čunát
2013-03-02 10:41:53 +01:00
parent 97b24ed95a a920c50cfb
commit 26af997d41
101 changed files with 2221 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/manual-config.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, runCommand, nettools, perl, kmod, writeTextFile }:
{ stdenv, runCommand, nettools, bc, perl, kmod, writeTextFile }:
with stdenv.lib;
@@ -122,7 +122,7 @@ stdenv.mkDerivation {
runHook postConfigure
'';
nativeBuildInputs = [ perl nettools ];
nativeBuildInputs = [ perl bc nettools ];
makeFlags = commonMakeFlags ++ [
"INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}"