From d9f06f666590497715a4f0800d52c94c3a00df25 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 2 Jan 2016 18:59:09 +0100 Subject: [PATCH] libpsl: 0.11.0 -> 0.12.0 --- pkgs/development/libraries/libpsl/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 1412e1d59fa..b8ae3060a2f 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu -, libxslt, pkgconfig }: +, libxslt, pkgconfig, python }: let @@ -13,23 +13,24 @@ let owner = "publicsuffix"; }; - libVersion = "0.11.0"; + libVersion = "0.12.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm"; + sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h + patchShebangs src/make_dafsa.py ''; preAutoreconf = '' @@ -41,7 +42,12 @@ in stdenv.mkDerivation { # The libpsl check phase requires the list's test scripts (tests/) as well cp -Rv "${listSources}"/* list ''; - configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ]; + configureFlags = [ + "--disable-builtin" + "--disable-static" + "--enable-gtk-doc" + "--enable-man" + ]; enableParallelBuilding = true;