public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librsvg: make-fonts-conf: update with correct native deps

Browse Source
This commit is contained in:
Michael Eden 2019-03-08 23:55:02 -05:00 committed by John Ericson
parent a891ae5130
commit 3bcede8f5c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
View File

@ -2,7 +2,8 @@
runCommand "fonts.conf" runCommand "fonts.conf"
{ {
buildInputs = [ libxslt fontconfig ]; nativeBuildInputs = [ libxslt ];
buildInputs = [ fontconfig ];
# Add a default font for non-nixos systems, <1MB and in nixos defaults. # Add a default font for non-nixos systems, <1MB and in nixos defaults.
fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
} }

4
pkgs/development/libraries/librsvg/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
, bzip2, libcroco, libintl, darwin, rust, gnome3 , bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
, withGTK ? false, gtk3 ? null , withGTK ? false, gtk3 ? null
, vala, gobject-introspection }: , vala, gobject-introspection }:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobject-introspection ] nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices ApplicationServices
]); ]);