From 9808244aae52ceb7c5a0c0d6e8cb9ca160124d55 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 18:35:37 +0000 Subject: harfbuzz: fix tests, also cleanup --- pkgs/development/libraries/harfbuzz/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/harfbuzz') diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index a0160a8440da..24260234116b 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -2,6 +2,7 @@ , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it +, python }: let @@ -17,6 +18,11 @@ stdenv.mkDerivation { sha256 = "0my6m9aqv4a8fc2pjwqx9pfdfh3a9mqvas4si4psi1b1867zi8y8"; }; + postPatch = '' + patchShebangs src/gen-def.py + patchShebangs test + ''; + outputs = [ "out" "dev" ]; outputBin = "dev"; @@ -29,8 +35,10 @@ stdenv.mkDerivation { buildInputs = [ glib freetype cairo ]; # recommended by upstream propagatedBuildInputs = [] ++ optional withGraphite2 graphite2 - ++ optionals withIcu [ icu harfbuzz ] - ; + ++ optionals withIcu [ icu harfbuzz ]; + + checkInputs = [ python ]; + doInstallCheck = false; # fails, probably a bug # Slightly hacky; some pkgs expect them in a single directory. postInstall = optionalString withIcu '' -- cgit 1.4.1