From b64924b0d57c0032d03d1b762b877148aa9cda9b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 12:20:26 +0300 Subject: [PATCH 1/7] cups: 2.1.3 -> 2.1.4 --- pkgs/misc/cups/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 88c3d335f87..6c717037777 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -5,17 +5,17 @@ ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. -let version = "2.1.3"; in with stdenv.lib; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "cups-${version}"; + version = "2.1.4"; passthru = { inherit version; }; src = fetchurl { - url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"; + url = "https://github.com/apple/cups/releases/download/release-${version}/cups-${version}-source.tar.gz"; + sha256 = "13bjxw256wd1nff22vj2z25mdhllj2h6d9xypsg55b40661zs52b"; }; # FIXME: the cups libraries contains some $out/share strings so can't be split. From b8e3560504c7589acec2ef639ec8dc509c89ca60 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 12:20:39 +0300 Subject: [PATCH 2/7] cups_filters: 1.5.0 -> 1.11.1 --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 7394daefb7c..f1f597ac0a0 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.5.0"; + version = "1.11.1"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0cjrh4wpdhkvmahfkg8f2a2qzilcq12i78q5arwr7dnmx1j8hapj"; + sha256 = "0x0jxn1hnif92m7dyqrqh015gpsf79dviarb7dfl0zya2drlk1m8"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From 447d88d4153c0d6879a0c2a47b8f1e98a4e69ce7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 12:20:57 +0300 Subject: [PATCH 3/7] poppler: 0.43.0 -> 0.46.0 --- pkgs/development/libraries/poppler/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index e445af46e09..9a15c87bf7d 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -7,8 +7,8 @@ }: let # beware: updates often break cups_filters build - version = "0.43.0"; # even major numbers are stable - sha256 = "0mi4zf0pz3x3fx3ir7szz1n57nywgbpd4mp2r7mvf47f4rmf4867"; + version = "0.46.0"; # even major numbers are stable + sha256 = "11z4d5vrrd0m7w9bfydwabksk273z7z0xf2nwvzf5pk17p8kazcn"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; @@ -33,9 +33,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - # Any package depending on Qt >= 5.7 must build using the C++11 standard. - CXXFLAGS = lib.optional qt5Support "-std=c++11"; - configureFlags = with lib; [ "--enable-xpdf-headers" From d5e1f5bbaa911432b20131d62afbe52ab7309402 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 12:46:38 +0300 Subject: [PATCH 4/7] poppler: use openjpeg instead of unmaintained internal decoder --- pkgs/development/libraries/poppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9a15c87bf7d..9e8817c6ea7 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg ] - ++ optionals (!minimal) [ cairo lcms curl openjpeg ] + [ zlib freetype fontconfig libjpeg openjpeg ] + ++ optionals (!minimal) [ cairo lcms curl ] ++ optional qt4Support qt4 ++ optional qt5Support qtbase; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ] ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" - "--disable-libopenjpeg" "--disable-libcurl" + "--disable-libcurl" ] ++ optional (!utils) "--disable-utils" ; From 7ce717a56cc2141bd6364938065b7bc33316f372 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 12:46:58 +0300 Subject: [PATCH 5/7] poppler_data: install pkgconfig files --- pkgs/data/misc/poppler-data/default.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 59dd4da792b..beac8105199 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "poppler-data-0.4.7"; @@ -8,22 +8,17 @@ stdenv.mkDerivation rec { sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7"; }; - buildInputs = [ cmake ]; + postPatch = '' + sed -i 's,$(datadir)/pkgconfig,$(prefix)/lib/pkgconfig,g' Makefile + ''; -# TODO: actually use $prefix/etc/profile.d in NixOS - postInstall = - '' - mkdir -pv ''${out}/etc/profile.d - echo "export POPPLER_DATADIR=''${out}/share/poppler" | - tee ''${out}/etc/profile.d/60-poppler.sh - chmod -c +x ''${out}/etc/profile.d/60-poppler.sh - ''; + installFlags = [ "prefix=$(out)" ]; - meta = { + meta = with stdenv.lib; { homepage = http://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.free; # more free licenses combined - maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = platforms.all; + license = licenses.free; # more free licenses combined + maintainers = with maintainers; [ urkud ]; }; } From 1bde33074efa11fa2edcf71032d2e634f852f349 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 15:22:33 +0300 Subject: [PATCH 6/7] poppler_data: embed into poppler, make an option Previously we relied on an environment variable POPPLER_DATADIR which practically noone used and everyone was expected to set. This is a good candidate for a feature option because noone really _noticed_ that this data is not available. Disabled by default because of this and size of the data (22M). --- pkgs/applications/graphics/xournal/default.nix | 6 +++--- .../development/libraries/poppler/datadir_env.patch | 13 ------------- pkgs/development/libraries/poppler/default.nix | 9 +++++---- pkgs/tools/typesetting/pdfgrep/default.nix | 10 ++-------- 4 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/poppler/datadir_env.patch diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 9c93b9d7317..53d0473638a 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , ghostscript, atk, gtk, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui -, pango, libX11, xproto, zlib, poppler, poppler_data +, pango, libX11, xproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: stdenv.mkDerivation rec { version = "0.4.8"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript atk gtk glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui - pango libX11 xproto zlib poppler poppler_data + pango libX11 xproto zlib poppler ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - NIX_LDFLAGS="-lX11 -lz"; + NIX_LDFLAGS = [ "-lX11" "-lz" ]; meta = { homepage = http://xournal.sourceforge.net/; diff --git a/pkgs/development/libraries/poppler/datadir_env.patch b/pkgs/development/libraries/poppler/datadir_env.patch deleted file mode 100644 index fd111d71355..00000000000 --- a/pkgs/development/libraries/poppler/datadir_env.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc -index 2e11bb0..a277ab9 100644 ---- a/poppler/GlobalParams.cc -+++ b/poppler/GlobalParams.cc -@@ -748,7 +748,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir) - void GlobalParams::scanEncodingDirs() { - GDir *dir; - GDirEntry *entry; -- const char *dataRoot = popplerDataDir ? popplerDataDir : POPPLER_DATADIR; -+ const char *dataRoot = popplerDataDir ? popplerDataDir : ( getenv("POPPLER_DATADIR") ? getenv("POPPLER_DATADIR") : POPPLER_DATADIR ); - - // allocate buffer large enough to append "/nameToUnicode" - size_t bufSize = strlen(dataRoot) + strlen("/nameToUnicode") + 1; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9e8817c6ea7..097031d54f1 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,9 +1,10 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, minimal ? false +, withData ? false, poppler_data , qt4Support ? false, qt4 ? null , qt5Support ? false, qtbase ? null -, utils ? false, suffix ? "glib" +, utils ? false +, minimal ? false, suffix ? "glib" }: let # beware: updates often break cups_filters build @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - patches = [ ./datadir_env.patch ]; + buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { ++ optional qt4Support qt4 ++ optional qt5Support qtbase; - nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig ]; NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index cef212b2a13..6e5f98d4a71 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, poppler, poppler_data, makeWrapper }: +{ fetchurl, stdenv, pkgconfig, poppler, makeWrapper }: stdenv.mkDerivation rec { name = "pdfgrep-${version}"; @@ -9,19 +9,13 @@ stdenv.mkDerivation rec { sha256 = "6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437"; }; - buildInputs = [ pkgconfig poppler poppler_data makeWrapper ]; + buildInputs = [ pkgconfig poppler makeWrapper ]; patchPhase = '' sed -i -e "s%cpp/poppler-document.h%poppler/cpp/poppler-document.h%" pdfgrep.cc sed -i -e "s%cpp/poppler-page.h%poppler/cpp/poppler-page.h%" pdfgrep.cc ''; - # workarround since it can't be hardcoded in pdfgrep - preFixup = '' - wrapProgram "$out/bin/pdfgrep" \ - --set POPPLER_DATADIR "${poppler_data}/share/poppler" - ''; - meta = { description = "A tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; From c998a769511252af5d2d17fe999c97410f73272b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 15:12:07 +0300 Subject: [PATCH 7/7] mupdf: cleanup, use system libraries --- pkgs/applications/misc/mupdf/default.nix | 36 +++++++++++++++++------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 1724b0d612f..e6a51560675 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -18,17 +18,32 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958"; sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7"; }) + # Compatibility with new openjpeg + (fetchpatch { + name = "mupdf-1.5-openjpeg-2.1.0.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.5-openjpeg-2.1.0.patch?h=packages/mupdf&id=ca5e3ef6c7788ccfb6011d785078bc47762f19e5"; + sha256 = "0f18793q9fd22h3lclm8wahvc8az4v08an6lzy8mczrkl8mcgm3k"; + }) ]; NIX_CFLAGS_COMPILE= [ "-fPIC" ]; + makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib freetype libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama ]; + buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ]; + outputs = [ "out" "bin" "doc" ]; - installPhase = '' - make install prefix=$out - gcc -shared -o $out/lib/libmupdf.so.${version} -Wl,--whole-archive $out/lib/libmupdf.a -Wl,--no-whole-archive + preConfigure = '' + # Don't remove mujs because upstream version is incompatible + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} + ''; - ln -s $out/lib/libmupdf.so.${version} $out/lib/libmupdf.so + postInstall = '' + for i in $out/lib/*.a; do + so="''${i%.a}.so" + gcc -shared -o $so.${version} -Wl,--whole-archive $i -Wl,--no-whole-archive + ln -s $so.${version} $so + rm $i + done mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/mupdf.pc" < $out/share/applications/mupdf.desktop < $bin/share/applications/mupdf.desktop <