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

Merge branch 'master' into x-updates

Browse Source 
Needed that to fix the tarball.
This commit is contained in:
Vladimír Čunát
2013-04-11 23:31:33 +02:00
parent 7d9607f151 6640000cb7
commit 8249695b61
110 changed files with 1361 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/gcc/4.6/default.nix
View File

@@ -333,6 +333,7 @@ stdenv.mkDerivation ({
crossAttrs = {
patches = patches ++ [ ./hurd-sigrtmin.patch ];
postPatch = "";
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";

8
pkgs/development/compilers/mono/default.nix
View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}:
stdenv.mkDerivation {
name = "mono-2.10.8.1";
stdenv.mkDerivation rec {
name = "mono-2.11.4";
src = fetchurl {
url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz;
sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr";
};
buildInputs = [bison pkgconfig glib gettext perl libgdiplus];