From 562376398d4108bee1ddd46c44864d9947f1301c Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Fri, 7 Apr 2023 16:57:28 -0400 Subject: hackneyed: 0.8.2 -> 0.9.1 Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/data/icons/hackneyed/default.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/icons/hackneyed/default.nix b/pkgs/data/icons/hackneyed/default.nix index 74aedaa3786e2..e26a32b159ecf 100644 --- a/pkgs/data/icons/hackneyed/default.nix +++ b/pkgs/data/icons/hackneyed/default.nix @@ -1,29 +1,41 @@ -{ lib, fetchzip, stdenvNoCC, fetchFromGitLab, xcursorgen, imagemagick6, inkscape }: +{ lib, stdenvNoCC, fetchFromGitLab, imagemagick, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "hackneyed"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitLab { owner = "Enthymeme"; repo = "hackneyed-x11-cursors"; rev = version; - sha256 = "sha256-Wtrw/EzxCj4cAyfdBp0OJE4+c6FouW7+b6nFTLxdXNY="; + hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g="; }; - buildInputs = [ imagemagick6 inkscape xcursorgen ]; + nativeBuildInputs = [ imagemagick inkscape xcursorgen ]; postPatch = '' patchShebangs *.sh - substituteInPlace make-png.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape ''; enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "INKSCAPE=inkscape" + "INSTALL=install" + "PREFIX=$(out)" + "VERBOSE=1" + "XCURSORGEN=xcursorgen" + ]; + buildFlags = [ "theme" "theme.left" ]; + # The Makefile declares a dependency on the value of $(INKSCAPE) for some reason; + # it's unnecessary for building though. + prePatch = '' + substituteInPlace GNUmakefile \ + --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:' + ''; + meta = with lib; { homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; -- cgit 1.4.1