pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #7257 from spwhitt/inkscape

Fixes to build inkscape on Darwin

Aristid Breitkreuz 13360ba5 70562642

+20 -5
unified split
+5
pkgs/applications/graphics/inkscape/default.nix
··· 16 17 postPatch = '' 18 patchShebangs share/extensions 19 ''; 20 21 propagatedBuildInputs = [
··· 16 17 postPatch = '' 18 patchShebangs share/extensions 19 + '' 20 + # Clang gets misdetected, so hardcode the right answer 21 + + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' 22 + substituteInPlace src/ui/tool/node.h \ 23 + --replace "#if __cplusplus >= 201103L" "#if true" 24 ''; 25 26 propagatedBuildInputs = [
+1 -1
pkgs/development/libraries/glibmm/default.nix
··· 25 license = stdenv.lib.licenses.lgpl2Plus; 26 27 maintainers = with stdenv.lib.maintainers; [urkud raskin]; 28 - platforms = stdenv.lib.platforms.linux; 29 }; 30 }
··· 25 license = stdenv.lib.licenses.lgpl2Plus; 26 27 maintainers = with stdenv.lib.maintainers; [urkud raskin]; 28 + platforms = stdenv.lib.platforms.unix; 29 }; 30 }
+1 -1
pkgs/development/libraries/gtkmm/2.x.nix
··· 33 license = stdenv.lib.licenses.lgpl2Plus; 34 35 maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; 36 - platforms = stdenv.lib.platforms.linux; 37 }; 38 }
··· 33 license = stdenv.lib.licenses.lgpl2Plus; 34 35 maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; 36 + platforms = stdenv.lib.platforms.unix; 37 }; 38 }
+1 -1
pkgs/development/libraries/gtkmm/3.x.nix
··· 37 license = stdenv.lib.licenses.lgpl2Plus; 38 39 maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; 40 - platforms = stdenv.lib.platforms.linux; 41 }; 42 }
··· 37 license = stdenv.lib.licenses.lgpl2Plus; 38 39 maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; 40 + platforms = stdenv.lib.platforms.unix; 41 }; 42 }
+3
pkgs/development/libraries/libcdr/default.nix
··· 12 13 nativeBuildInputs = [ pkgconfig ]; 14 15 CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h 16 17 meta = {
··· 12 13 nativeBuildInputs = [ pkgconfig ]; 14 15 + configureFlags = if (stdenv.cc.cc.isClang or false) 16 + then [ "--disable-werror" ] else null; 17 + 18 CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h 19 20 meta = {
+8 -1
pkgs/development/libraries/librevenge/default.nix
··· 19 src = fetchurl { 20 inherit (s) url sha256; 21 }; 22 meta = { 23 inherit (s) version; 24 description = ''A base library for writing document import filters''; 25 license = stdenv.lib.licenses.mpl20 ; 26 maintainers = [stdenv.lib.maintainers.raskin]; 27 - platforms = stdenv.lib.platforms.linux; 28 }; 29 }
··· 19 src = fetchurl { 20 inherit (s) url sha256; 21 }; 22 + 23 + # Clang generates warnings in Boost's header files 24 + # -Werror causes these warnings to be interpreted as errors 25 + # Simplest solution: disable -Werror 26 + configureFlags = if (stdenv.cc.cc.isClang or false) 27 + then [ "--disable-werror" ] else null; 28 + 29 meta = { 30 inherit (s) version; 31 description = ''A base library for writing document import filters''; 32 license = stdenv.lib.licenses.mpl20 ; 33 maintainers = [stdenv.lib.maintainers.raskin]; 34 + platforms = stdenv.lib.platforms.unix; 35 }; 36 }
+1 -1
pkgs/development/libraries/libvisio/default.nix
··· 18 meta = { 19 description = "A library providing ability to interpret and import visio diagrams into various applications"; 20 homepage = http://www.freedesktop.org/wiki/Software/libvisio; 21 - platforms = stdenv.lib.platforms.gnu; # random choice 22 }; 23 }
··· 18 meta = { 19 description = "A library providing ability to interpret and import visio diagrams into various applications"; 20 homepage = http://www.freedesktop.org/wiki/Software/libvisio; 21 + platforms = stdenv.lib.platforms.unix; 22 }; 23 }