From df5c1f0d3e23afcee4dda1e83f5b9a0b2add3056 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 24 Jan 2023 20:12:29 +0100 Subject: [PATCH] treewide: fonts: remove dontBuild in stdenvNoCC --- pkgs/data/fonts/baekmuk-ttf/default.nix | 2 -- pkgs/data/fonts/bakoma-ttf/default.nix | 2 -- pkgs/data/fonts/caladea/default.nix | 2 -- pkgs/data/fonts/cm-unicode/default.nix | 2 -- pkgs/data/fonts/crimson-pro/default.nix | 2 -- pkgs/data/fonts/crimson/default.nix | 2 -- pkgs/data/fonts/culmus/default.nix | 2 -- pkgs/data/fonts/go-font/default.nix | 2 -- pkgs/data/fonts/gyre/default.nix | 2 -- pkgs/data/fonts/hannom/default.nix | 2 -- pkgs/data/fonts/hermit/default.nix | 2 -- pkgs/data/fonts/julia-mono/default.nix | 2 -- pkgs/data/fonts/kacst/default.nix | 2 -- pkgs/data/fonts/khmeros/default.nix | 2 -- pkgs/data/fonts/lao/default.nix | 2 -- pkgs/data/fonts/lklug-sinhala/default.nix | 2 -- pkgs/data/fonts/lmodern/default.nix | 2 -- pkgs/data/fonts/luculent/default.nix | 2 -- pkgs/data/fonts/lxgw-wenkai/default.nix | 2 -- pkgs/data/fonts/marathi-cursive/default.nix | 2 -- pkgs/data/fonts/material-design-icons/default.nix | 2 -- pkgs/data/fonts/nanum/default.nix | 2 -- pkgs/data/fonts/oldsindhi/default.nix | 2 -- pkgs/data/fonts/takao/default.nix | 2 -- pkgs/data/fonts/tibetan-machine/default.nix | 2 -- pkgs/data/fonts/ttf-bitstream-vera/default.nix | 2 -- pkgs/data/fonts/u001/default.nix | 2 -- pkgs/data/fonts/unfonts-core/default.nix | 2 -- pkgs/data/fonts/vdrsymbols/default.nix | 2 -- pkgs/data/fonts/wqy-microhei/default.nix | 2 -- pkgs/data/fonts/wqy-zenhei/default.nix | 2 -- 31 files changed, 62 deletions(-) diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 6c80c2a02f5..3777f69fa56 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-CKt9/7VdWIfMlCzjcPXjO3VqVfu06vC5DyRAcOjVGII="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 38f028cd92e..1d305674e6a 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-dYaUMneFn1yC5lIMSLQSNmFRW16AdUXGqWBobzAbPsg="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index d6235d42f7f..bd00e807309 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-xI0cL9YTycBslZw02nuDiAWeJAjSuxmEXcPtNfduTQk="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index 7b6a9a1f087..fc59baa5f9d 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-VIp+vk1IYbEHW15wMrfGVOPqg1zBZDpgFx+jlypOHCg="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/crimson-pro/default.nix b/pkgs/data/fonts/crimson-pro/default.nix index d07f5c94937..29066b5ec3c 100644 --- a/pkgs/data/fonts/crimson-pro/default.nix +++ b/pkgs/data/fonts/crimson-pro/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { hash = "sha256-3zFB1AMcC7eNEVA2Mx1OE8rLN9zPzexZ3FtER9wH5ss="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index 2607f660284..1868c897bd5 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -11,8 +11,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-Wp9L77q93TRmrAr0P4iH9gm0tqFY0X/xSsuFcd19aAE="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 8f8cd297484..28a7f4385a0 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-wMaHN0LQdUT2us8q1S65yzkpdNVkJ5ONwd+8g5nGTQU="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 63b4acc9c31..63d62ec2e82 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-rdzt51wY4b7HEr7W/0Ar/FB0zMyf+nKLsOT+CRSEP3o="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index aa6e3fde257..254766d1de2 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-+6IufuFf+IoLXoZEPlfHUNgRhKrQNBEZ1OwPD9/uOjg="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/hannom/default.nix b/pkgs/data/fonts/hannom/default.nix index 72ba87fb17f..d91de86c532 100644 --- a/pkgs/data/fonts/hannom/default.nix +++ b/pkgs/data/fonts/hannom/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-Oh8V72tYvVA6Sk0f9UTIkRQYjdUbEB/fmCSaRYfyoP8="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix index 4e12a29ee8a..3ff770522d9 100644 --- a/pkgs/data/fonts/hermit/default.nix +++ b/pkgs/data/fonts/hermit/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-RYXZ2yJ8BIxsgeEwhXz7g0NnWG3kMPZoJaOLMUQyWWQ="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 1bdddde0719..47b1afd36fd 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-mq37L3bhUhdjB8z3I9i8+wyLrMSsu/nZrZXOuqE3JlU="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/kacst/default.nix b/pkgs/data/fonts/kacst/default.nix index 9d72ca9cdb4..aa5ed8b547d 100644 --- a/pkgs/data/fonts/kacst/default.nix +++ b/pkgs/data/fonts/kacst/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-byiZzpYiMU6kJs+NSISfHPFzAnJtc8toNIbV/fKiMzg="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/data/fonts/khmeros/default.nix index ba27b465bff..5df7c3637be 100644 --- a/pkgs/data/fonts/khmeros/default.nix +++ b/pkgs/data/fonts/khmeros/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-gBcM9YHSuhbxvwfQTvywH/5kN921GOyvGtkROcmcBiw="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/lao/default.nix b/pkgs/data/fonts/lao/default.nix index 58b08c654a7..d7d5d3ddd4b 100644 --- a/pkgs/data/fonts/lao/default.nix +++ b/pkgs/data/fonts/lao/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-DlgdyfhxxzVkNIL+NGsQ+PRlNkCuG3v2OahkIEYx60o="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/data/fonts/lklug-sinhala/default.nix index 6610d6a213e..817dbbb2531 100644 --- a/pkgs/data/fonts/lklug-sinhala/default.nix +++ b/pkgs/data/fonts/lklug-sinhala/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-oPCCa01PMQcCK5fEILgXjrGzoDg+UvxkqK6AgeQaKio="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 2df5f65e6c4..85aa7060ea0 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-xlUuZt6rjW0pX4t6PKWAHkkv3PisGCj7ZwatZPAUNxk="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index 8dd60f23d0c..1347af957e4 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-6NxLnTBnvHmTUTFa2wW0AuKPEbCqzaWQyiFVnF0sBqU="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index f38991233ae..c16a5f77492 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-Nkd0xXYCnR0NZAk/JCxy+zOlxIxD52Px4F9o2L9mgRE="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index 3dfb46fff69..b8dd5492a56 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-JE9T3UMSYn/JfEWuWHikDJIlt4nZl6GzY98v3vG6di4="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index fdd85f66e40..49d52ebb779 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -4,8 +4,6 @@ stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; version = "7.1.96"; - dontBuild = true; - src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/data/fonts/nanum/default.nix index d768c6d96d6..8f432edf419 100644 --- a/pkgs/data/fonts/nanum/default.nix +++ b/pkgs/data/fonts/nanum/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-GlVXH9YUU3wHMkNoz5miBv7N2oUEbwUXlcVoElQ9++4="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index 9c805378400..88692d91456 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-jOcl+mo6CJ9Lnn3nAUiXXHCJssovVgLoPrbGxj4uzQs="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/data/fonts/takao/default.nix index 349edea60ff..353287d4d77 100644 --- a/pkgs/data/fonts/takao/default.nix +++ b/pkgs/data/fonts/takao/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/data/fonts/tibetan-machine/default.nix index 9fa22c5fa81..4731bfcd365 100644 --- a/pkgs/data/fonts/tibetan-machine/default.nix +++ b/pkgs/data/fonts/tibetan-machine/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-c/1Sgv7xKHpsJGjY9ZY2qOJHShGHL1robvphFNJOt5w="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 10098d6cf04..e71888969f6 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-21sn33u7MYA269t1rNPpjxvW62YI+3CmfUeM0kPReNw="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/u001/default.nix b/pkgs/data/fonts/u001/default.nix index fc2f3a48636..c50e972a4d6 100644 --- a/pkgs/data/fonts/u001/default.nix +++ b/pkgs/data/fonts/u001/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { stripRoot = false; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/unfonts-core/default.nix b/pkgs/data/fonts/unfonts-core/default.nix index 7325730e4f2..5756a948f69 100644 --- a/pkgs/data/fonts/unfonts-core/default.nix +++ b/pkgs/data/fonts/unfonts-core/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-OwpydPmqt+jw8ZOMAacOFYF2bVG0lLoUVoPzesVXkY4="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index de4ef5f36f2..5df82b31cfe 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-YxB+JcDkta5are+OQyP/WKDL0vllgn0m26bU9mQ3C/Q="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index 80645bf496e..7c410e7d00e 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-KAKsgCOqNqZupudEWFTjoHjTd///QhaTQb0jeHH3IT4="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 9b0757128cd..a5106b5e6b1 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-5LfjBkdb+UJ9F1dXjw5FKJMMhMROqj8WfUxC8RDuddY="; }; - dontBuild = true; - installPhase = '' runHook preInstall