diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index c370cc069c5..ca52a4f2766 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs share/extensions + '' + # Clang gets misdetected, so hardcode the right answer + + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + substituteInPlace src/ui/tool/node.h \ + --replace "#if __cplusplus >= 201103L" "#if true" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index c0f0983d73d..9e06ed66412 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index d0782d94e5e..76175859e7d 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2d5798186c4..e158c64f73a 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 23fafb44c81..21666ed3034 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + configureFlags = if (stdenv.cc.cc.isClang or false) + then [ "--disable-werror" ] else null; + CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h meta = { diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 465b03b88fd..ff7886d0513 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -19,11 +19,18 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + + # Clang generates warnings in Boost's header files + # -Werror causes these warnings to be interpreted as errors + # Simplest solution: disable -Werror + configureFlags = if (stdenv.cc.cc.isClang or false) + then [ "--disable-werror" ] else null; + meta = { inherit (s) version; description = ''A base library for writing document import filters''; license = stdenv.lib.licenses.mpl20 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index c015e7473bd..d03fabcc653 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import visio diagrams into various applications"; homepage = http://www.freedesktop.org/wiki/Software/libvisio; - platforms = stdenv.lib.platforms.gnu; # random choice + platforms = stdenv.lib.platforms.unix; }; }