diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-24 18:52:34 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-24 18:52:50 +0200 |
| commit | 2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2 (patch) | |
| tree | 5e777ec37c3804c2e3611710fb5a1e45149a8692 /pkgs/development | |
| parent | bce42c282a9f58191362e25a3fa91d261bd7e388 (diff) | |
| download | nixpkgs-2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2.tar nixpkgs-2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2.tar.gz nixpkgs-2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2.tar.bz2 nixpkgs-2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2.tar.lz nixpkgs-2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2.tar.xz nixpkgs-2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2.tar.zst nixpkgs-2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2.zip | |
Fix tarball build
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/go/1.3.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/rustc/0.11.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/rustc/head.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 06decd16190..1dcdd89b5bf 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -1,5 +1,7 @@ { stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +assert stdenv.gcc.gcc != null; + let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; diff --git a/pkgs/development/compilers/rustc/0.11.nix b/pkgs/development/compilers/rustc/0.11.nix index 1c3b09b0985..a7246e44a73 100644 --- a/pkgs/development/compilers/rustc/0.11.nix +++ b/pkgs/development/compilers/rustc/0.11.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: +assert stdenv.gcc.gcc != null; + /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index ad33906ae6e..4f512096a42 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}: +assert stdenv.gcc.gcc != null; + /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f4157cdd8d0..4f7c6042f13 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,6 +7,8 @@ with stdenv.lib; +assert stdenv.gcc.gcc != null; + # TODO: # * Add gio-module-fam # Problem: cyclic dependency on gamin |