From 6f55db13eb745068766ac34f843590d39701735e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 20:17:14 +0000 Subject: [PATCH 1/3] tela-icon-theme: skip patchelf and symlink rewrite steps * We don't have any ELFs to patch. * Scanning all the symlinks is slow, and jdupes already makes them relative anyway. --- pkgs/data/icons/tela-icon-theme/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index 23e56e6107c..c3bed509ed9 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; + # These fixup steps are slow and unnecessary. + dontPatchELF = true; + dontRewriteSymlinks = true; + installPhase = '' runHook preInstall From a494e0ce56bb476ecea69c85ccdf1f6a5ccc6a92 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 20:17:59 +0000 Subject: [PATCH 2/3] tela-icon-theme: switch to gpl3Only Since the license isn't documented anywhere other than COPYING, it must be assumed that the intent was to license only under the included license, without any extra clauses such as the "(at your option) any later version" clause. --- pkgs/data/icons/tela-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index c3bed509ed9..557ea99b34f 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A flat colorful Design icon theme"; homepage = "https://github.com/vinceliuice/tela-icon-theme"; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ figsoda ]; }; From 134c68a411fb8b52cf761ee799d5b242c9b87e18 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 2 May 2021 20:18:48 +0000 Subject: [PATCH 3/3] tela-icon-theme: use stdenvNoCC This doesn't use any of the compilers tools, so it may as well use the compilerless version of the stdenv. --- pkgs/data/icons/tela-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index 557ea99b34f..aaf32fdf16d 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes, lib, stdenv }: +{ fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes, lib, stdenvNoCC }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; version = "2021-01-21";