From 7615027fadea92ca1757c6c40d2bb1c2e9ef824f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 22 Oct 2018 13:43:11 -0700 Subject: [PATCH] libowfat: 0.31 -> 0.32 (#48414) * libowfat: 0.31 -> 0.32 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libowfat/versions * libowfat: keep headers under include directory 0.32 wanted to move them under include/libowfat/ but it breaks gatling and opentracker --- .../development/libraries/libowfat/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 1304aff9e3b3..8c0094a3152b 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,17 +1,29 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libowfat-0.31"; + name = "libowfat-0.32"; src = fetchurl { url = "https://www.fefe.de/libowfat/${name}.tar.xz"; - sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i"; + sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; }; + # Dirty patch because 0.32 "moved headers to upon install" + # but it breaks gatling-0.15 and opentracker-2018-05-26 ... + postPatch = '' + substituteInPlace GNUmakefile --replace \ + 'install -d $(DESTDIR)$(INCLUDEDIR)/libowfat' \ + 'install -d $(DESTDIR)$(INCLUDEDIR)' + substituteInPlace GNUmakefile --replace \ + 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat' \ + 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)' + ''; + makeFlags = "prefix=$(out)"; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.fefe.de/libowfat/; + homepage = https://www.fefe.de/libowfat/; license = licenses.gpl2; platforms = platforms.linux; };