diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cairo/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 64d0e67b3f0f..799024f19acf 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, fetchpatch, pkgconfig, autoreconfHook, gtk-doc +{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, gtk-doc , pixman , zlibSupport ? true, zlib , pngSupport ? true, libpng @@ -8,7 +8,7 @@ , x11Support ? !stdenv.isDarwin, libX11, libXext , x11XrenderSupport ? x11Support, libXrender , xcbSupport ? !stdenv.isDarwin, libxcb # no longer experimental since 1.12 -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) , libGL ? null # libGLU libGL is no longer a big dependency , darwin @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk-doc - pkgconfig + pkg-config ]; buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -100,7 +100,7 @@ in stdenv.mkDerivation rec { preConfigure = # On FreeBSD, `-ldl' doesn't exist. - stdenv.lib.optionalString stdenv.isFreeBSD + lib.optionalString stdenv.isFreeBSD '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in do cat "$i" | sed -es/-ldl//g > t |