From a76ed73cdac6a4d60c511c4d8d1d98730b14fed8 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Mon, 30 Oct 2023 11:33:58 +0700 Subject: [PATCH] pkgs(soundfonts/*): `meta.broken` -> `preferLocalBuild` --- ci.nix | 6 ++---- pkgs/soundfonts/arachno.nix | 3 ++- pkgs/soundfonts/touhou.nix | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci.nix b/ci.nix index 0fef707..1193769 100644 --- a/ci.nix +++ b/ci.nix @@ -2,8 +2,7 @@ # package outputs in your package set. These are what gets built by CI, # so if you correctly mark packages as # -# - broken (using `meta.broken`), -# - unfree (using `meta.license.free`), and +# - broken (using `meta.broken`), and # - locally built (using `preferLocalBuild`) # # then your CI will be able to build and cache only those packages for @@ -15,8 +14,7 @@ with builtins; let isReserved = n: n == "lib" || n == "overlays" || n == "modules"; isDerivation = p: isAttrs p && p ? type && p.type == "derivation"; - # isBuildable = p: !(p.meta.broken or false) && p.meta.license.free or true; - isBuildable = p: !(p.meta.broken or false) && !p.meta.binary or true; + isBuildable = p: !(p.meta.broken or false); isCacheable = p: !(p.preferLocalBuild or false); shouldRecurseForDerivations = p: isAttrs p && p.recurseForDerivations or false; diff --git a/pkgs/soundfonts/arachno.nix b/pkgs/soundfonts/arachno.nix index 1f44ac8..239ab5c 100644 --- a/pkgs/soundfonts/arachno.nix +++ b/pkgs/soundfonts/arachno.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation rec { homepage = "http://www.arachnosoft.com/main/soundfont.php"; license = licenses.unfree; platforms = platforms.all; - binary = true; }; + + preferLocalBuild = true; } diff --git a/pkgs/soundfonts/touhou.nix b/pkgs/soundfonts/touhou.nix index feef91c..31ac566 100644 --- a/pkgs/soundfonts/touhou.nix +++ b/pkgs/soundfonts/touhou.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://musical-artifacts.com/artifacts/433"; license = licenses.cc-by-40; platforms = platforms.all; - binary = true; }; + + preferLocalBuild = true; }