diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-07-20 08:45:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 08:45:05 +0000 |
| commit | 23c93a5205fd98ac9cdb8eabbbd2c2c9bc9a324e (patch) | |
| tree | c6918251d1a149ff6c3c0ebd400968b4cc5c7458 /pkgs/data/fonts | |
| parent | a8546a078df91b2fa3a37395698a7224e35408bb (diff) | |
| parent | 8402a74cce2216de0fd2cce4e5fd897e5dedd450 (diff) | |
Merge pull request #85169 from prusnak/inkscape
inkscape: 0.92.5 -> 1.0
Diffstat (limited to 'pkgs/data/fonts')
| -rw-r--r-- | pkgs/data/fonts/emojione/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/fonts/twemoji-color-font/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 6f5168e90d5e2..71bd2216da2d6 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "emojione"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { export HOME="$NIX_BUILD_ROOT" ''; - nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; + nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ]; enableParallelBuilding = true; diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index a9bf3720c071d..ed04aa78ae169 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "twemoji-color-font"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; }; - nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; + nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ]; # silence inkscape errors about non-writable home preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; |