Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7e30cfff780b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0b6c2cfc4d15
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 28, 2018

  1. poppler: fix v0.61 build with clang

    @LnL7
    LnL7 committed May 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    samsonasik Abdul Malik Ikhsan
    GPG key ID: 69AC5BC354C89BE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e30c7eb View commit details

  2. poppler: remove libintlOrEmpty from v0.61

    @LnL7
    LnL7 committed May 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    samsonasik Abdul Malik Ikhsan
    GPG key ID: 69AC5BC354C89BE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b6c2cf View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/development/libraries/poppler/0.61.nix
7 changes: 5 additions & 2 deletions pkgs/development/libraries/poppler/0.61.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

outputs = [ "out" "dev" ];

buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data;
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;

# TODO: reduce propagation to necessary libs
propagatedBuildInputs = with lib;
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ninja pkgconfig ];

# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

cmakeFlags = [
(mkFlag true "XPDF_HEADERS")
(mkFlag (!minimal) "GLIB")