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

Fix broken use of builtins.currentSystem

Browse Source 
Packages should never use builtins.currentSystem.
This commit is contained in:
Eelco Dolstra 2014-07-28 11:28:35 +02:00
parent 30431e7160
commit 50f548771e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,11 +56,9 @@ stdenv.mkDerivation rec {
'' ''
+ (stdenv.lib.optionalString withPlugin + (stdenv.lib.optionalString withPlugin
(let hplip_arch = (let hplip_arch =
if builtins.currentSystem == "i686-linux" if stdenv.system == "i686-linux" then "x86_32"
then "x86_32" else if stdenv.system == "x86_64-linux" then "x86_64"
else if builtins.currentSystem == "x86_64-linux" else abort "Platform must be i686-linux or x86_64-linux!";
then "x86_64"
else abort "Platform must be i686-linux or x86_64-linux!";
in in
'' ''
sh ${plugin} --noexec --keep sh ${plugin} --noexec --keep