diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:28:35 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:28:35 +0200 |
| commit | 50f548771e016bc6563b5b6b23a49c2ed6da88a0 (patch) | |
| tree | 7552052c623f732f3b9785704071545d06531d92 /pkgs | |
| parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
| download | nixlib-50f548771e016bc6563b5b6b23a49c2ed6da88a0.tar nixlib-50f548771e016bc6563b5b6b23a49c2ed6da88a0.tar.gz nixlib-50f548771e016bc6563b5b6b23a49c2ed6da88a0.tar.bz2 nixlib-50f548771e016bc6563b5b6b23a49c2ed6da88a0.tar.lz nixlib-50f548771e016bc6563b5b6b23a49c2ed6da88a0.tar.xz nixlib-50f548771e016bc6563b5b6b23a49c2ed6da88a0.tar.zst nixlib-50f548771e016bc6563b5b6b23a49c2ed6da88a0.zip | |
Fix broken use of builtins.currentSystem
Packages should never use builtins.currentSystem.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
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 |