From 4e77334d2c176b125193205fa78647158458a0ba Mon Sep 17 00:00:00 2001 From: Stephane Raux Date: Sun, 21 Nov 2021 23:40:22 -0600 Subject: [PATCH 1/2] numix-cursor-theme: 1.1 -> 1.2 The patch was merged in https://github.com/numixproject/numix-cursor-theme/pull/7 --- pkgs/data/icons/numix-cursor-theme/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 377cf05ac179..2cc3b20811c3 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: +{ lib, stdenv, fetchFromGitHub, inkscape, xcursorgen }: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.2"; package-name = "numix-cursor-theme"; name = "${package-name}-${version}"; @@ -9,20 +9,11 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = "v${version}"; - sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi"; + sha256 = "1q3w5i0h3ly6i7s9pqjdrb14kp89i78s0havri7lhiqyxizjvcvh"; }; nativeBuildInputs = [ inkscape xcursorgen ]; - patches = [ - # Remove when https://github.com/numixproject/numix-cursor-theme/pull/7 is merged - (fetchpatch { - url = "https://github.com/stephaneyfx/numix-cursor-theme/commit/3b647bf768cebb8f127b88e3786f6a9640460197.patch"; - sha256 = "174kmhlvv76wwvndkys78aqc32051sqg3wzc0xg6b7by4agrbg76"; - name = "support-inkscape-1-in-numix-cursor-theme.patch"; - }) - ]; - buildPhase = '' patchShebangs . HOME=$TMP ./build.sh From 10e89127994fbeebf7f1cf07df49e9c53bd7eca1 Mon Sep 17 00:00:00 2001 From: Stephane Raux Date: Mon, 22 Nov 2021 08:52:59 -0600 Subject: [PATCH 2/2] numix-cursor-theme: Define pname --- pkgs/data/icons/numix-cursor-theme/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 2cc3b20811c3..e7f0905ff40e 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, inkscape, xcursorgen }: stdenv.mkDerivation rec { + pname = "numix-cursor-theme"; version = "1.2"; - package-name = "numix-cursor-theme"; - name = "${package-name}-${version}"; src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = "v${version}"; sha256 = "1q3w5i0h3ly6i7s9pqjdrb14kp89i78s0havri7lhiqyxizjvcvh"; };