diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libowfat')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libowfat/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libowfat/default.nix b/nixpkgs/pkgs/development/libraries/libowfat/default.nix index 665121b58b5c..a04050458edf 100644 --- a/nixpkgs/pkgs/development/libraries/libowfat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libowfat/default.nix @@ -2,13 +2,26 @@ stdenv.mkDerivation rec { pname = "libowfat"; - version = "0.32"; + version = "0.33"; src = fetchurl { url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz"; - sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; + sha256 = "sha256-MR7Is/S3K7RC4yP7ATqY+Vb6dFVH8ryUVih7INAnzX0="; }; + # Fix for glibc 2.34 from Gentoo + # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914a4aa87415dabfe77181a2365766417a5919a4 + postPatch = '' + # do not define "__pure__", this the gcc builtin (bug #806505) + sed 's#__pure__;#__attribute__((__pure__));#' -i fmt.h scan.h byte.h stralloc.h str.h critbit.h || die + sed 's#__pure__$#__attrib__pure__#' -i fmt.h scan.h byte.h stralloc.h str.h critbit.h || die + # remove unneeded definition of __deprecated__ + sed '/^#define __deprecated__$/d' -i scan/scan_iso8601.c scan/scan_httpdate.c || die + ''; + preBuild = '' + make headers + ''; + makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; @@ -17,8 +30,5 @@ stdenv.mkDerivation rec { homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; - # Doesn't build with glibc 2.34: https://hydra.nixos.org/build/156248131 - # Should be fixed with the next release: https://bugs.gentoo.org/806505 - broken = true; }; } |