summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-04-02 16:24:12 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-04-02 16:26:32 +0200
commit056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (patch)
tree1949c0dfe7c1a80cfa01de3d70874cd865b04d70 /pkgs/data
parentab15a62c68bf7bf3b02e3bab00d121cc1426733c (diff)
downloadnixlib-056b5a1a5f2a4096dd39db2265e5ca369c03ec15.tar
nixlib-056b5a1a5f2a4096dd39db2265e5ca369c03ec15.tar.gz
nixlib-056b5a1a5f2a4096dd39db2265e5ca369c03ec15.tar.bz2
nixlib-056b5a1a5f2a4096dd39db2265e5ca369c03ec15.tar.lz
nixlib-056b5a1a5f2a4096dd39db2265e5ca369c03ec15.tar.xz
nixlib-056b5a1a5f2a4096dd39db2265e5ca369c03ec15.tar.zst
nixlib-056b5a1a5f2a4096dd39db2265e5ca369c03ec15.zip
tzdata: fixup after merging master
also rename lib output to dev - it contains a header and a static lib.
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/misc/tzdata/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 5b51da58e622..8ffd21330602 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 = {