From 5176f640ee631ef58dafaac6a9fe689e122f8041 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 25 Sep 2024 23:48:05 +0300 Subject: [PATCH] cups-idprt-{barcode,mt888,mt890,sp900,tspl}: Fix missing attribute on `aarch64-linux` `getAttr` has a slightly better performance but it's not possible to throw with it so one would have to do `builtins.hasAttr` first which makes that methods performance worse than string interpolation and `or throw` --- pkgs/by-name/cu/cups-idprt-barcode/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-mt888/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-mt890/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-sp900/package.nix | 11 +++++++---- pkgs/by-name/cu/cups-idprt-tspl/package.nix | 11 +++++++---- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/cu/cups-idprt-barcode/package.nix b/pkgs/by-name/cu/cups-idprt-barcode/package.nix index 1f9bb0b168f9..a5e3a85b5a94 100644 --- a/pkgs/by-name/cu/cups-idprt-barcode/package.nix +++ b/pkgs/by-name/cu/cups-idprt-barcode/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-barcode: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-mt888/package.nix b/pkgs/by-name/cu/cups-idprt-mt888/package.nix index 27441a467b30..0fa4fd146d06 100644 --- a/pkgs/by-name/cu/cups-idprt-mt888/package.nix +++ b/pkgs/by-name/cu/cups-idprt-mt888/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-mt888: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-mt890/package.nix b/pkgs/by-name/cu/cups-idprt-mt890/package.nix index ca3baacbcfe4..96ca74b35ee6 100644 --- a/pkgs/by-name/cu/cups-idprt-mt890/package.nix +++ b/pkgs/by-name/cu/cups-idprt-mt890/package.nix @@ -25,10 +25,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-mt890: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-sp900/package.nix b/pkgs/by-name/cu/cups-idprt-sp900/package.nix index ed07c4fc36be..34243a325ee7 100644 --- a/pkgs/by-name/cu/cups-idprt-sp900/package.nix +++ b/pkgs/by-name/cu/cups-idprt-sp900/package.nix @@ -34,10 +34,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-sp900: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall diff --git a/pkgs/by-name/cu/cups-idprt-tspl/package.nix b/pkgs/by-name/cu/cups-idprt-tspl/package.nix index 60aa4c8c80d8..f165015c14f4 100644 --- a/pkgs/by-name/cu/cups-idprt-tspl/package.nix +++ b/pkgs/by-name/cu/cups-idprt-tspl/package.nix @@ -33,10 +33,13 @@ stdenvNoCC.mkDerivation { installPhase = let - arch = builtins.getAttr stdenvNoCC.hostPlatform.system { - x86_64-linux = "x64"; - x86-linux = "x86"; - }; + arch = + { + x86_64-linux = "x64"; + x86-linux = "x86"; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "cups-idprt-tspl: No prebuilt filters for system: ${stdenvNoCC.hostPlatform.system}"); in '' runHook preInstall