Skip to content

Commit

Permalink
dejavu-fonts: fix missing Perl IOString dependency (#39341)
Browse files Browse the repository at this point in the history
Per the docs, IOString was recently added as a dependency:
https://github.com/dejavu-fonts/dejavu-fonts/blob/master/BUILDING.md

As-is, attempting to rebulid from source errors out with this missing perl module.
  • Loading branch information
bhipple authored and Mic92 committed Apr 22, 2018
1 parent cf540dd commit 9e9cc47
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pkgs/data/fonts/dejavu-fonts/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{fetchFromGitHub, stdenv, fontforge, perl, FontTTF}:
{ fetchFromGitHub, stdenv, fontforge, perl, perlPackages }:

let
version = "2.37";
Expand All @@ -25,7 +25,7 @@ let

full-ttf = stdenv.mkDerivation {
name = "dejavu-fonts-full-${version}";
nativeBuildInputs = [fontforge perl FontTTF];
nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF];

src = fetchFromGitHub {
owner = "dejavu-fonts";
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14241,9 +14241,7 @@ with pkgs;

crimson = callPackage ../data/fonts/crimson {};

dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {
inherit (perlPackages) FontTTF;
});
dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {});

# solve collision for nix-env before https://github.com/NixOS/nix/pull/815
dejavu_fontsEnv = buildEnv {
Expand Down

0 comments on commit 9e9cc47

Please sign in to comment.