From f074e5957d1aa5543cdd38679921bc4e426f875b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Apr 2015 11:57:22 +0200
Subject: [PATCH] tzdata: go back to using a single output
The *.{a,h} files are very tiny together,
and I didn't see why a cyclic referrence was being created.
---
pkgs/data/misc/tzdata/default.nix | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 57417022176..bce168c2a9a 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl }:
-let version = "2015c"; in
+let version = "2015c";
-stdenv.mkDerivation rec {
+self = stdenv.mkDerivation rec {
name = "tzdata-${version}";
srcs =
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
];
sourceRoot = ".";
- outputs = [ "out" "lib" ];
+ #outputs = [ "out" "lib" ]; # TODO: maybe resurrect, and maybe install man pages?
- makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(lib)/lib MANDIR=$(TMPDIR)/man AWK=awk CFLAGS=-DHAVE_LINK=0";
+ makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(out)/lib MANDIR=$(TMPDIR)/man AWK=awk CFLAGS=-DHAVE_LINK=0";
postInstall =
''
@@ -27,8 +27,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 "$out/include"
+ cp tzfile.h "$out/include/tzfile.h"
'';
meta = {
@@ -37,3 +37,6 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all;
};
}
+
+;in self // { lib = self; }
+