From 50e0de123279a89f5352f848165f41be0f98b2b5 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Mon, 26 Oct 2020 22:28:29 +0100 Subject: [PATCH 1/2] icon-slicer: init at 0.3 --- pkgs/tools/X11/icon-slicer/default.nix | 29 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/X11/icon-slicer/default.nix diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/tools/X11/icon-slicer/default.nix new file mode 100644 index 000000000000..18d6d468af8c --- /dev/null +++ b/pkgs/tools/X11/icon-slicer/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }: +stdenv.mkDerivation rec { + pname = "icon-slicer"; + version = "0.3"; + + src = fetchurl { + url = "https://freedesktop.org/software/icon-slicer/releases/icon-slicer-${version}.tar.gz"; + sha256 = "0kdnc08k2rs8llfg7xgvnrsk60x59pv5fqz6kn2ifnn2s1nj3w05"; + }; + + patches = [ + # Fixes hotspot `y` coordinate. The `x` coordinate is used on the y-axis. + (fetchurl { + url = "https://aur.archlinux.org/cgit/aur.git/plain/hotspotfix.patch?h=icon-slicer"; + sha256 = "1l1dc1x5p4hys02arkmq3x6b1xdi510969d25g928zr4gf4an03h"; + }) + ]; + + nativeBuildInputs = [ popt pkg-config ]; + buildInputs = [ gdk-pixbuf ]; + + meta = with stdenv.lib; { + description = "Utility for generating icon themes and libXcursor cursor themes"; + homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/"; + license = licenses.mit; + maintainers = with maintainers; [ zaninime ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0c6266c4b9..72e3a995856b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2362,6 +2362,8 @@ in inchi = callPackage ../development/libraries/inchi {}; + icon-slicer = callPackage ../tools/X11/icon-slicer { }; + ifm = callPackage ../tools/graphics/ifm {}; ink = callPackage ../tools/misc/ink { }; From cf68af0245b2029260e9a4d1cc8707b2aefd3670 Mon Sep 17 00:00:00 2001 From: Francesco Zanini Date: Mon, 26 Oct 2020 22:28:47 +0100 Subject: [PATCH 2/2] openzone-cursors: init at 1.2.9 --- pkgs/data/themes/openzone/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/data/themes/openzone/default.nix diff --git a/pkgs/data/themes/openzone/default.nix b/pkgs/data/themes/openzone/default.nix new file mode 100644 index 000000000000..cce23bd76ea0 --- /dev/null +++ b/pkgs/data/themes/openzone/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, icon-slicer, xcursorgen }: +stdenv.mkDerivation rec { + pname = "openzone-cursors"; + version = "1.2.9"; + + src = fetchFromGitHub { + owner = "ducakar"; + repo = pname; + rev = "v${version}"; + sha256 = "02c536mc17ccsrzgma366k3wlm02ivklvr30fafxl981zgghlii4"; + }; + + nativeBuildInputs = [ icon-slicer xcursorgen ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + description = "Clean and sharp X11/Wayland cursor theme"; + homepage = "https://www.gnome-look.org/p/999999/"; + license = licenses.mit; + maintainers = with maintainers; [ zaninime ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72e3a995856b..7d2acc02eb85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20168,6 +20168,8 @@ in open-sans = callPackage ../data/fonts/open-sans { }; + openzone-cursors = callPackage ../data/themes/openzone { }; + orbitron = callPackage ../data/fonts/orbitron { }; orion = callPackage ../data/themes/orion {};