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

Merge pull request #31281 from lheckemann/firefox-bin-arch-check

Browse Source 
firefox-bin: Fail on unsupported architectures
This commit is contained in:
Orivej Desh 2017-11-05 19:05:18 +00:00 committed by GitHub
commit 5db01ac420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -54,9 +54,12 @@ let
inherit (generated) version sources;
arch = if stdenv.system == "i686-linux"
then "linux-i686"
else "linux-x86_64";
mozillaPlatforms = {
"i686-linux" = "linux-i686";
"x86_64-linux" = "linux-x86_64";
};
arch = mozillaPlatforms.${stdenv.system};
isPrefixOf = prefix: string:
builtins.substring 0 (builtins.stringLength prefix) string == prefix;
@ -185,7 +188,7 @@ stdenv.mkDerivation {
free = false;
url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
};
platforms = platforms.linux;
platforms = builtins.attrNames mozillaPlatforms;
maintainers = with maintainers; [ garbas ];
};
}