diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-18 22:50:56 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-19 01:16:25 -0800 |
| commit | 9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch) | |
| tree | 9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/development/libraries/poppler | |
| parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) | |
| download | nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.gz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.bz2 nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.lz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.xz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.zst nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.zip | |
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.
Diffstat (limited to 'pkgs/development/libraries/poppler')
| -rw-r--r-- | pkgs/development/libraries/poppler/0.61.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 0603f49fad4..bc141075973 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ optional qt5Support qtbase ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Not sure when and how to pass it. It seems an upstream bug anyway. CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index e7b9a26f19f..80d5ba19d2b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ optional utils nss ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkgconfig ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; # Workaround #54606 preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' |