dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

tzdata: fixup after merging master

Browse Source 
also rename lib output to dev - it contains a header and a static lib.
This commit is contained in:
Vladimír Čunát 2016-04-02 16:24:12 +02:00
parent ab15a62c68
commit 056b5a1a5f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,14 +16,16 @@ stdenv.mkDerivation rec {
]; ];
sourceRoot = "."; sourceRoot = ".";
outputs = [ "out" "lib" ];
outputs = [ "out" "man" "dev" ];
propagatedBuildOutputs = [];
makeFlags = [ makeFlags = [
"TOPDIR=$(out)" "TOPDIR=$(out)"
"TZDIR=$(out)/share/zoneinfo" "TZDIR=$(out)/share/zoneinfo"
"ETCDIR=$(TMPDIR)/etc" "ETCDIR=$(TMPDIR)/etc"
"LIBDIR=$(lib)/lib" "LIBDIR=$(dev)/lib"
"MANDIR=$(TMPDIR)/man" "MANDIR=$(man)/man"
"AWK=awk" "AWK=awk"
"CFLAGS=-DHAVE_LINK=0" "CFLAGS=-DHAVE_LINK=0"
]; ];
@ -34,8 +36,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 "$dev/include"
cp tzfile.h "$lib/include/tzfile.h" cp tzfile.h "$dev/include/tzfile.h"
''; '';
meta = { meta = {

2
pkgs/os-specific/darwin/opencflite/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
configureFlags = [ "--with-uuid=${libuuid}" ]; configureFlags = [ "--with-uuid=${libuuid}" ];
buildInputs = [ icu tzdata.lib ]; buildInputs = [ icu tzdata.dev ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {