From 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Apr 2016 16:24:12 +0200
Subject: [PATCH] tzdata: fixup after merging master

also rename lib output to dev - it contains a header and a static lib.
---
 pkgs/data/misc/tzdata/default.nix              | 12 +++++++-----
 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 5b51da58e62..8ffd2133060 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 a2408bfc5c8..1cd7f2bf9d6 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 = {