summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-24 18:52:34 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-24 18:52:50 +0200
commit2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2 (patch)
tree5e777ec37c3804c2e3611710fb5a1e45149a8692
parentbce42c282a9f58191362e25a3fa91d261bd7e388 (diff)
Fix tarball build
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix2
-rw-r--r--pkgs/development/compilers/go/1.3.nix2
-rw-r--r--pkgs/development/compilers/rustc/0.11.nix2
-rw-r--r--pkgs/development/compilers/rustc/head.nix2
-rw-r--r--pkgs/development/libraries/glib/default.nix2
-rw-r--r--pkgs/games/adom/default.nix2
-rw-r--r--pkgs/servers/nosql/influxdb/default.nix2
-rw-r--r--pkgs/tools/filesystems/yandex-disk/default.nix3
9 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 969ced923b3d..56ba95c661f5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -37,6 +37,8 @@
, systemd
}:
+assert stdenv.isLinux;
+
let
version = "31.0";
sources = [
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 15acd5af8dfd..6add41edf7c3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -37,6 +37,8 @@
, pango
}:
+assert stdenv.isLinux;
+
let
version = "31.0";
sources = [
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 06decd16190a..1dcdd89b5bf4 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 1c3b09b0985a..a7246e44a73d 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 ad33906ae6e9..4f512096a423 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 f4157cdd8d0a..4f7c6042f136 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
diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index e83f50df1b78..ef5aba96d092 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -1,6 +1,8 @@
{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio
, xlibs, plowshare }:
+assert stdenv.isLinux;
+
let
inherit (xlibs) libXext libX11;
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 77852b6d2ed9..6c6fb213cb8c 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,5 +1,7 @@
{ stdenv, fetchurl, makeWrapper }:
+assert stdenv.isLinux;
+
stdenv.mkDerivation rec {
name = "influxdb-${version}";
version = "0.7.0";
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 24dbae08fab3..c9078a0cb8be 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -1,4 +1,7 @@
{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }:
+
+assert stdenv.isLinux;
+
let
p = if stdenv.is64bit then {
arch = "x86_64";