diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/freetype/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/freetype/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index b87e64c2afbf..7b5fff29a286 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , buildPackages -, pkgconfig, which, makeWrapper +, pkg-config, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -10,13 +10,13 @@ }: let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in stdenv.mkDerivation rec { pname = "freetype"; version = "2.10.4"; - meta = with stdenv.lib; { + meta = with lib; { description = "A font rendering engine"; longDescription = '' FreeType is a portable and efficient library for rendering fonts. It @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which makeWrapper ] + nativeBuildInputs = [ pkg-config which makeWrapper ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { postInstall = glib.flattenInclude + '' substituteInPlace $dev/bin/freetype-config \ - --replace ${buildPackages.pkgconfig} ${pkgconfig} + --replace ${buildPackages.pkg-config} ${pkg-config} wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" |