From 6dbb6a380ba7280acd3c94a0273a92564c15935a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 24 Mar 2018 14:56:15 +0100 Subject: [PATCH] poppler: fix evaluation, probably after merges --- pkgs/development/libraries/poppler/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index faeadeb5b4e..11dd8ec3291 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -32,6 +32,7 @@ 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 = [ @@ -43,9 +44,6 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = if stdenv.cc.isClang then [ "-std=c++11" ] else null; - meta = with lib; { homepage = https://poppler.freedesktop.org/; description = "A PDF rendering library";