public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Vladimír Čunát 2015-04-24 11:57:22 +02:00
parent 375bc8def7
commit f074e5957d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/data/misc/tzdata/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let version = "2015c"; in let version = "2015c";
stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
name = "tzdata-${version}"; name = "tzdata-${version}";
srcs = srcs =
@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
]; ];
sourceRoot = "."; 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 = postInstall =
'' ''
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
ln -s . $out/share/zoneinfo/posix ln -s . $out/share/zoneinfo/posix
mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
mkdir -p "$lib/include" mkdir -p "$out/include"
cp tzfile.h "$lib/include/tzfile.h" cp tzfile.h "$out/include/tzfile.h"
''; '';
meta = { meta = {
@ -37,3 +37,6 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }
;in self // { lib = self; }