diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-11-20 21:25:45 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-11-21 01:35:34 +0100 |
| commit | 2e248040a6a2de3846c791ac7df0f1d63b2481d0 (patch) | |
| tree | 4b8135dbbf60870d113b702b3bf15d805e40171c /pkgs/misc/drivers/hplip | |
| parent | 729b764c534d5d2018977a2c1718a896667b20b9 (diff) | |
| download | nixlib-2e248040a6a2de3846c791ac7df0f1d63b2481d0.tar nixlib-2e248040a6a2de3846c791ac7df0f1d63b2481d0.tar.gz nixlib-2e248040a6a2de3846c791ac7df0f1d63b2481d0.tar.bz2 nixlib-2e248040a6a2de3846c791ac7df0f1d63b2481d0.tar.lz nixlib-2e248040a6a2de3846c791ac7df0f1d63b2481d0.tar.xz nixlib-2e248040a6a2de3846c791ac7df0f1d63b2481d0.tar.zst nixlib-2e248040a6a2de3846c791ac7df0f1d63b2481d0.zip | |
hplip: fix broken `platforms` hack
Diffstat (limited to 'pkgs/misc/drivers/hplip')
| -rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 9d6bd2dcfb97..c09017594a7d 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -29,15 +29,16 @@ let src = ./hplip.state; }; - hplipArch = + hplipPlatforms = { - "i686-linux" = "x86_32"; + "i686-linux" = "x86_32"; "x86_64-linux" = "x86_64"; - "arm6l-linux" = "arm32"; - "arm7l-linux" = "arm32"; - }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}"); + "armv6l-linux" = "arm32"; + "armv7l-linux" = "arm32"; + }; - platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; + hplipArch = hplipPlatforms."${stdenv.system}" + or (abort "Unsupported platform ${stdenv.system}"); in @@ -108,7 +109,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; postInstall = - (stdenv.lib.optionalString (withPlugin && builtins.elem stdenv.system platforms) + (stdenv.lib.optionalString (withPlugin && builtins.hasAttr stdenv.system hplipPlatforms) (let hplipArch = if stdenv.system == "i686-linux" then "x86_32" else if stdenv.system == "x86_64-linux" then "x86_64" |