From 50f548771e016bc6563b5b6b23a49c2ed6da88a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jul 2014 11:28:35 +0200 Subject: Fix broken use of builtins.currentSystem Packages should never use builtins.currentSystem. --- pkgs/misc/drivers/hplip/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/misc') diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index fcec3bf26754..a4d2ca621a1c 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -56,11 +56,9 @@ stdenv.mkDerivation rec { '' + (stdenv.lib.optionalString withPlugin (let hplip_arch = - if builtins.currentSystem == "i686-linux" - then "x86_32" - else if builtins.currentSystem == "x86_64-linux" - then "x86_64" - else abort "Platform must be i686-linux or x86_64-linux!"; + if stdenv.system == "i686-linux" then "x86_32" + else if stdenv.system == "x86_64-linux" then "x86_64" + else abort "Platform must be i686-linux or x86_64-linux!"; in '' sh ${plugin} --noexec --keep -- cgit 1.4.1