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

libical: 1.0.0 -> 1.0.1

Browse Source
This commit is contained in:
William A. Kennington III 2015-03-26 17:29:57 -07:00
parent 611a4bfc0d
commit 5e790f0e17
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/libical/default.nix
View File

@ -1,13 +1,25 @@
{stdenv, fetchurl, perl, cmake}: { stdenv, fetchFromGitHub, perl, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pName = "libical"; name = "libical-${version}";
name = "${pName}-1.0"; version = "1.0.1";
src = fetchurl {
url = "mirror://sourceforge/freeassociation/${pName}/${name}/${name}.tar.gz"; src = fetchFromGitHub {
sha256 = "1dy0drz9hy0sn2q3s2lp00jb9bis5gsm7n3m4zga49s9ir2b6fbw"; owner = "libical";
repo = "libical";
rev = "v${version}";
sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9";
}; };
nativeBuildInputs = [ perl cmake ]; nativeBuildInputs = [ perl cmake ];
patches = [ ./respect-env-tzdir.patch ]; patches = [ ./respect-env-tzdir.patch ];
meta = with stdenv.lib; {
homepage = https://github.com/libical/libical;
description = "an Open Source implementation of the iCalendar protocols";
license = licenses.mpl10;
platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ];
};
} }

16
pkgs/development/libraries/libical/respect-env-tzdir.patch
View File

@ -1,21 +1,19 @@
* Remove /usr/*/zoneinfo from the default search path
* Respect $TZDIR
diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
index adf7598..d2fd5c8 100644 index fe984c9..22ba0a1 100644
--- a/src/libical/icaltz-util.c --- a/src/libical/icaltz-util.c
+++ b/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c
@@ -108,7 +108,7 @@ typedef struct @@ -107,7 +107,7 @@ typedef struct
char charcnt[4];
static int r_pos [] = {1, 2, 3, -2, -1}; } tzinfo;
-static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
+static char *search_paths [] = {"/etc/zoneinfo"}; +static char *search_paths [] = {"/etc/zoneinfo"};
static char *zdir = NULL; static char *zdir = NULL;
#define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
@@ -195,6 +195,16 @@ set_zonedir (void) @@ -194,6 +194,16 @@ set_zonedir (void)
const char *fname = ZONES_TAB_SYSTEM_FILENAME; const char *fname = ZONES_TAB_SYSTEM_FILENAME;
int i; unsigned int i;
+ const char *env_tzdir = strdup (getenv ("TZDIR")); + const char *env_tzdir = strdup (getenv ("TZDIR"));
+ if (env_tzdir) { + if (env_tzdir) {
@ -27,6 +25,6 @@ index adf7598..d2fd5c8 100644
+ free (env_tzdir); + free (env_tzdir);
+ } + }
+ +
for (i = 0;i < NUM_SEARCH_PATHS; i++) { for (i = 0; i < NUM_SEARCH_PATHS; i++) {
sprintf (file_path, "%s/%s", search_paths [i], fname); sprintf (file_path, "%s/%s", search_paths [i], fname);
if (!access (file_path, F_OK|R_OK)) { if (!access (file_path, F_OK|R_OK)) {