diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
| commit | 2fec9c6e297e02718db6be53d645524f0052a7bc (patch) | |
| tree | 93e73a98dfaa40b290a6e15cf7f61054e5dc59e0 /pkgs/tools/typesetting | |
| parent | e9961bf9a9f7410c2891c7e86c21ed6388c70d78 (diff) | |
| parent | ba816ee08721d0c2f5f7e6652091bed085ac7687 (diff) | |
| download | nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.gz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.bz2 nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.lz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.xz nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.tar.zst nixlib-2fec9c6e297e02718db6be53d645524f0052a7bc.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/tools/build-managers/conan/default.nix
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/pdf2htmlEX/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix index b6d29052dcce..e0f3681f43d8 100644 --- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8 +, poppler, xorg, pcre, python, glib, fontforge, cairo, pango, openjdk8 }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xlibs.libpthreadstubs - xlibs.libXdmcp + xorg.libpthreadstubs + xorg.libXdmcp pcre python glib |