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

Merge pull request #85169 from prusnak/inkscape

Browse Source 
inkscape: 0.92.5 -> 1.0
This commit is contained in:
Michael Raskin
2020-07-20 08:45:05 +00:00
committed by GitHub
parent a8546a078d 8402a74cce
commit 23c93a5205
23 changed files with 228 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/fonts/emojione/default.nix
+2 -2
View File
@@ -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;
pkgs/data/fonts/twemoji-color-font/default.nix
+2 -2
View File
@@ -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" ];