diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2020-11-25 01:29:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 01:29:21 +0100 |
| commit | 7b6ccbfba07d296048d85d4accb2da725b316665 (patch) | |
| tree | 3ed464d078a01312e4324d4198229ceb50aed647 | |
| parent | 998970e70355209ab46ad3a7238cffd7f3b11e7f (diff) | |
| parent | f7fca06ef918343df846e02f8f0f8804f3e69b3e (diff) | |
Merge pull request #102526 from IvarWithoutBones/empty-capitaine-cursors-fix
capitaine-cursors: fix build with inkscape => 1.0
| -rw-r--r-- | pkgs/data/icons/capitaine-cursors/default.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix index 09491b904ef1..e57482b191b7 100644 --- a/pkgs/data/icons/capitaine-cursors/default.nix +++ b/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { @@ -12,11 +12,23 @@ stdenv.mkDerivation rec { sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9"; }; + patches = [ + # Fixes the build on inscape => 1.0, without this it generates empty cursor files + (fetchpatch { + name = "inkscape-1.0-compat"; + url = "https://github.com/keeferrourke/capitaine-cursors/commit/9da0b53e6098ed023c5c24c6ef6bfb1f68a79924.patch"; + sha256 = "0lx5i60ahy6a2pir4zzlqn5lqsv6claqg8mv17l1a028h9aha3cv"; + }) + ]; + postPatch = '' patchShebangs . ''; - buildInputs =[ + # Complains about not being able to find the fontconfig config file otherwise + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + buildInputs = [ inkscape xcursorgen bc @@ -36,14 +48,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = '' - An x-cursor theme inspired by macOS and based on KDE Breeze - ''; + description = "An x-cursor theme inspired by macOS and based on KDE Breeze"; homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ - eadwu - ]; + maintainers = with maintainers; [ eadwu ]; }; } |