diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-06-22 18:32:52 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-06-22 18:32:52 -0300 |
commit | a4e85ae2b88d29224bad8be685e6b366845a5257 (patch) | |
tree | 8c39efd96774b50205abf3fd61c08f090618b686 /pkgs/development/libraries/poppler | |
parent | 6943ac5dd761c1461438300743a153326caf3c97 (diff) | |
download | nixpkgs-a4e85ae2b88d29224bad8be685e6b366845a5257.tar nixpkgs-a4e85ae2b88d29224bad8be685e6b366845a5257.tar.gz nixpkgs-a4e85ae2b88d29224bad8be685e6b366845a5257.tar.bz2 nixpkgs-a4e85ae2b88d29224bad8be685e6b366845a5257.tar.lz nixpkgs-a4e85ae2b88d29224bad8be685e6b366845a5257.tar.xz nixpkgs-a4e85ae2b88d29224bad8be685e6b366845a5257.tar.zst nixpkgs-a4e85ae2b88d29224bad8be685e6b366845a5257.zip |
poppler_0_61: cosmetical rewrite 0.61.nix
Diffstat (limited to 'pkgs/development/libraries/poppler')
-rw-r--r-- | pkgs/development/libraries/poppler/0.61.nix | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 9b89283972d..e46da53f68d 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -1,5 +1,20 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl -, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch +{ stdenv +, lib +, fetchurl +, fetchpatch +, cairo +, cmake +, curl +, fontconfig +, freetype +, lcms +, libiconv +, libintl +, libjpeg +, ninja +, openjpeg +, pkg-config +, zlib , withData ? true, poppler_data , qt5Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null @@ -12,25 +27,38 @@ let mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { - name = "poppler-${suffix}-${version}"; + pname = "poppler-${suffix}"; + inherit version; src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; + url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; }; outputs = [ "out" "dev" ]; patches = [ + # Fix internal crash: a negative number that should not be (fetchpatch { name = "CVE-2018-13988"; url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee"; sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2"; }) + # Fix internal crash: a negative number that should not be (not the above!) ./0.61-CVE-2019-9959.patch ]; - buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + libiconv + libintl + ] + ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; @@ -39,8 +67,6 @@ stdenv.mkDerivation rec { ++ optional qt5Support qtbase ++ optional introspectionSupport gobject-introspection; - nativeBuildInputs = [ cmake ninja pkg-config ]; - # Not sure when and how to pass it. It seems an upstream bug anyway. CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; @@ -58,12 +84,10 @@ stdenv.mkDerivation rec { 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; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; |