Merge pull request #39896 from jtojnar/drop-poppler-qt4
poppler_qt4: remove
This commit is contained in:
commit
2e1f86bcbd
@ -1,22 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "open-pdf-presenter-git-2014-09-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olabini";
|
||||
repo = "open-pdf-presenter";
|
||||
rev = "f14930871b60b6ba50298c27377605e0a5fdf124";
|
||||
sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/olabini/open-pdf-presenter;
|
||||
description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
@ -1,44 +0,0 @@
|
||||
# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883)
|
||||
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
|
||||
, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
|
||||
, poppler_data, qt4
|
||||
}:
|
||||
|
||||
let
|
||||
# Last version supporting QT4
|
||||
version = "0.61.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "poppler-qt4-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/poppler-${version}.tar.xz";
|
||||
sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty;
|
||||
|
||||
propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_XPDF_HEADERS=on"
|
||||
"-DENABLE_UTILS=off"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://poppler.freedesktop.org/;
|
||||
description = "A PDF rendering library";
|
||||
|
||||
longDescription = ''
|
||||
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
|
||||
'';
|
||||
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ttuegel ];
|
||||
};
|
||||
}
|
@ -4139,8 +4139,6 @@ with pkgs;
|
||||
|
||||
update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };
|
||||
|
||||
open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { };
|
||||
|
||||
openvswitch = callPackage ../os-specific/linux/openvswitch { };
|
||||
|
||||
optipng = callPackage ../tools/graphics/optipng {
|
||||
@ -11033,8 +11031,6 @@ with pkgs;
|
||||
suffix = "min";
|
||||
};
|
||||
|
||||
poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { };
|
||||
|
||||
poppler_utils = poppler.override { suffix = "utils"; utils = true; };
|
||||
|
||||
popt = callPackage ../development/libraries/popt { };
|
||||
|
@ -3882,36 +3882,6 @@ in {
|
||||
|
||||
pomegranate = callPackage ../development/python-modules/pomegranate { };
|
||||
|
||||
poppler-qt4 = buildPythonPackage rec {
|
||||
name = "poppler-qt4-${version}";
|
||||
version = "0.18.1";
|
||||
disabled = isPy3k || isPyPy;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/p/python-poppler-qt4/" +
|
||||
"python-poppler-qt4-${version}.tar.gz";
|
||||
sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ];
|
||||
|
||||
preBuild = "${python}/bin/${python.executable} setup.py build_ext" +
|
||||
" --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/";
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/";
|
||||
|
||||
meta = {
|
||||
description = "A Python binding to Poppler-Qt4";
|
||||
longDescription = ''
|
||||
A Python binding to Poppler-Qt4 that aims for completeness
|
||||
and for being actively maintained.
|
||||
'';
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ sepi ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
|
||||
inherit (pkgs.qt5) qtbase;
|
||||
inherit (pkgs.libsForQt5) poppler;
|
||||
|
Loading…
Reference in New Issue
Block a user