diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-02 16:24:12 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-02 16:26:32 +0200 |
| commit | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (patch) | |
| tree | 1949c0dfe7c1a80cfa01de3d70874cd865b04d70 | |
| parent | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (diff) | |
tzdata: fixup after merging master
also rename lib output to dev - it contains a header and a static lib.
| -rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/opencflite/default.nix | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 5b51da58e6221..8ffd213306022 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -16,14 +16,16 @@ stdenv.mkDerivation rec { ]; sourceRoot = "."; - outputs = [ "out" "lib" ]; + + outputs = [ "out" "man" "dev" ]; + propagatedBuildOutputs = []; makeFlags = [ "TOPDIR=$(out)" "TZDIR=$(out)/share/zoneinfo" "ETCDIR=$(TMPDIR)/etc" - "LIBDIR=$(lib)/lib" - "MANDIR=$(TMPDIR)/man" + "LIBDIR=$(dev)/lib" + "MANDIR=$(man)/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" ]; @@ -34,8 +36,8 @@ stdenv.mkDerivation rec { ln -s . $out/share/zoneinfo/posix mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right - mkdir -p "$lib/include" - cp tzfile.h "$lib/include/tzfile.h" + mkdir -p "$dev/include" + cp tzfile.h "$dev/include/tzfile.h" ''; meta = { diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix index a2408bfc5c8a1..1cd7f2bf9d6e1 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--with-uuid=${libuuid}" ]; - buildInputs = [ icu tzdata.lib ]; + buildInputs = [ icu tzdata.dev ]; enableParallelBuilding = true; meta = { |