ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7257 from spwhitt/inkscape

Browse Source 
Fixes to build inkscape on Darwin
This commit is contained in:
Aristid Breitkreuz 2015-04-08 21:59:48 +02:00
commit 13360ba5dc
7 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/graphics/inkscape/default.nix
View File

@ -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 = [

2
pkgs/development/libraries/glibmm/default.nix
View File

@ -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;
};
}

2
pkgs/development/libraries/gtkmm/2.x.nix
View File

@ -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;
};
}

2
pkgs/development/libraries/gtkmm/3.x.nix
View File

@ -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;
};
}

3
pkgs/development/libraries/libcdr/default.nix
View File

@ -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 = {

9
pkgs/development/libraries/librevenge/default.nix
View File

@ -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;
};
}

2
pkgs/development/libraries/libvisio/default.nix
View File

@ -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;
};
}