Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f8c3f77eaad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3152e137908d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 1, 2017

  1. Copy the full SHA
    c13de40 View commit details
  2. Merge pull request #32237 from orivej/tzdata

    tzdata: export TZDIR for dependent packages
    orivej authored Dec 1, 2017
    Copy the full SHA
    3152e13 View commit details
Showing with 8 additions and 0 deletions.
  1. +2 −0 pkgs/data/misc/tzdata/default.nix
  2. +6 −0 pkgs/data/misc/tzdata/tzdata-setup-hook.sh
2 changes: 2 additions & 0 deletions pkgs/data/misc/tzdata/default.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
cp tzfile.h "$dev/include/tzfile.h"
'';

setupHook = ./tzdata-setup-hook.sh;

meta = {
homepage = http://www.iana.org/time-zones;
description = "Database of current and historical time zones";
6 changes: 6 additions & 0 deletions pkgs/data/misc/tzdata/tzdata-setup-hook.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
tzdataHook() {
export TZDIR=@out@/share/zoneinfo
}

envHooks+=(tzdataHook)
crossEnvHooks+=(tzdataHook)