diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 18:00:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 18:00:56 +0000 |
| commit | e112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (patch) | |
| tree | cfbfa6683968f4f673f45c5ca8b4d6b43bcef225 /pkgs/data | |
| parent | c17ba56fe923f649d8802777c586f61f8b8c4ad0 (diff) | |
| parent | ab5d8762780613cc7f99132ba29f8e6ef950178e (diff) | |
| download | nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.gz nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.bz2 nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.lz nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.xz nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.tar.zst nixpkgs-e112f9b8bbb5af9de4426046a7cb4490e2c12eb0.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/icons/hackneyed/default.nix | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/data/icons/hackneyed/default.nix b/pkgs/data/icons/hackneyed/default.nix index 74aedaa3786..e26a32b159e 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"; |