From ec980c7b1ec8a788dd25daacdc3df8eec6eb1bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 23 Nov 2015 15:42:22 +0100 Subject: [PATCH] hplip: fix evaluation errors on unsupported platforms Evidently, `abort` is unrecoverable, and `throw` should be used instead. Only partially tested, as I don't have enough RAM right now for it. --- pkgs/misc/drivers/hplip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 35d32f863ff..04ebb7a55ee 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -38,14 +38,14 @@ let }; hplipArch = hplipPlatforms."${stdenv.system}" - or (abort "HPLIP not supported on ${stdenv.system}"); + or (throw "HPLIP not supported on ${stdenv.system}"); pluginArches = [ "x86_32" "x86_64" ]; in assert withPlugin -> builtins.elem hplipArch pluginArches - || abort "HPLIP plugin not supported on ${stdenv.system}"; + || throw "HPLIP plugin not supported on ${stdenv.system}"; stdenv.mkDerivation { inherit name src;