From d8c5d95330d9806b3ee30569de76660f3931d5ee Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 21 Sep 2014 08:59:13 +0200 Subject: determinism: change some fixed timestamp to != (time_t)0 vcunat removed the unrelated glib change. Conflicts: pkgs/development/libraries/glib/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/os-specific/linux/kernel/manual-config.nix --- pkgs/os-specific/linux/kernel/generic.nix | 1 + pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 13250e45494..af2ae3b54db 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -57,6 +57,7 @@ let autoModules = stdenv.platform.kernelAutoModules; arch = stdenv.platform.kernelArch; + KBUILD_BUILD_TIMESTAMP = 1; # (time_t)1 crossAttrs = let cp = stdenv.cross.platform; in { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6d9baed7f2d..b840e252cdf 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -104,7 +104,7 @@ let buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970") ''; - buildFlags = [ + KBUILD_BUILD_TIMESTAMP=1; # (time_t)1 "KBUILD_BUILD_VERSION=1-NixOS" platform.kernelTarget ] ++ optional isModular "modules"; -- cgit 1.4.1