diff options
| author | Michael Eden <themichaeleden@gmail.com> | 2019-03-08 23:55:02 -0500 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-03-29 11:11:56 -0400 |
| commit | 3bcede8f5c4b7837468850679b55cc494ec017d1 (patch) | |
| tree | 9932d2dfdf39fabe3ce8801861f6cb8519f98732 /pkgs/development | |
| parent | a891ae51303f428aa065c2d917179f299e2b564f (diff) | |
| download | nixpkgs-3bcede8f5c4b7837468850679b55cc494ec017d1.tar nixpkgs-3bcede8f5c4b7837468850679b55cc494ec017d1.tar.gz nixpkgs-3bcede8f5c4b7837468850679b55cc494ec017d1.tar.bz2 nixpkgs-3bcede8f5c4b7837468850679b55cc494ec017d1.tar.lz nixpkgs-3bcede8f5c4b7837468850679b55cc494ec017d1.tar.xz nixpkgs-3bcede8f5c4b7837468850679b55cc494ec017d1.tar.zst nixpkgs-3bcede8f5c4b7837468850679b55cc494ec017d1.zip | |
librsvg: make-fonts-conf: update with correct native deps
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/librsvg/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 3cd4a894b37..b18d72e0a22 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -2,7 +2,8 @@ runCommand "fonts.conf" { - buildInputs = [ libxslt fontconfig ]; + nativeBuildInputs = [ libxslt ]; + buildInputs = [ fontconfig ]; # Add a default font for non-nixos systems, <1MB and in nixos defaults. fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9cd68cacfe7..c575cee752f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { 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 , vala, gobject-introspection }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 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; [ ApplicationServices ]); |