diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-08-25 18:14:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 18:14:42 -0400 |
| commit | 355cc312294a6962b777f410673acd1824ddcfc2 (patch) | |
| tree | 9c8f611eb7c5c3731d65f345f1951ddf04999eaf /pkgs/development | |
| parent | 78305bc5a14e2f1651221cd5f6871602573c2873 (diff) | |
| parent | 42701ee33e457af11ced7826ac7032b42842f23d (diff) | |
| download | nixpkgs-355cc312294a6962b777f410673acd1824ddcfc2.tar nixpkgs-355cc312294a6962b777f410673acd1824ddcfc2.tar.gz nixpkgs-355cc312294a6962b777f410673acd1824ddcfc2.tar.bz2 nixpkgs-355cc312294a6962b777f410673acd1824ddcfc2.tar.lz nixpkgs-355cc312294a6962b777f410673acd1824ddcfc2.tar.xz nixpkgs-355cc312294a6962b777f410673acd1824ddcfc2.tar.zst nixpkgs-355cc312294a6962b777f410673acd1824ddcfc2.zip | |
Merge pull request #17962 from vbgl/inkscape-darwin
inkscape: fix on darwin (fixes #15768)
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/cairomm/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 9953f283924..fbf3cd57e3b 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: +{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: let ver_maj = "1.12"; ver_min = "0"; @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cairo libsigcxx ]; - buildInputs = [ fontconfig freetype ]; + buildInputs = [ fontconfig freetype ] + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + ]); doCheck = true; @@ -35,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; license = with licenses; [ lgpl2Plus mpl10 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |