colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hplip: fix broken platforms hack

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-11-20 21:25:45 +01:00
parent 729b764c53
commit 2e248040a6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/misc/drivers/hplip/default.nix
View File

@ -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"