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

harfbuzz: fix tests, also cleanup

Browse Source
This commit is contained in:
Jan Malakhovski 2018-08-08 18:35:37 +00:00
parent 7ea0904347
commit 9808244aae
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -2,6 +2,7 @@
, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , 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 , 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 , withGraphite2 ? true # it is small and major distros do include it
, python
}: }:
let let
@ -17,6 +18,11 @@ stdenv.mkDerivation {
sha256 = "0my6m9aqv4a8fc2pjwqx9pfdfh3a9mqvas4si4psi1b1867zi8y8"; sha256 = "0my6m9aqv4a8fc2pjwqx9pfdfh3a9mqvas4si4psi1b1867zi8y8";
}; };
postPatch = ''
patchShebangs src/gen-def.py
patchShebangs test
'';
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
outputBin = "dev"; outputBin = "dev";
@ -29,8 +35,10 @@ stdenv.mkDerivation {
buildInputs = [ glib freetype cairo ]; # recommended by upstream buildInputs = [ glib freetype cairo ]; # recommended by upstream
propagatedBuildInputs = [] propagatedBuildInputs = []
++ optional withGraphite2 graphite2 ++ 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. # Slightly hacky; some pkgs expect them in a single directory.
postInstall = optionalString withIcu '' postInstall = optionalString withIcu ''