reewide: Purge all uses stdenv.system and top-level system

It is deprecated and will be removed after 18.09.
This commit is contained in:
John Ericson
2018-08-30 17:20:32 -04:00
parent 94f71d800d
commit 2c2f1e37d4
263 changed files with 594 additions and 577 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how
stdenv.mkDerivation {
name = "cups-gutenprint-binary-5.0.1";
src = if stdenv.system == "x86_64-linux" then fetchurl {
src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
url = https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb;
sha256 = "0an5gba6r6v54r53s2gj2fjk8fzpl4lrksjas2333528b0k8gbbc";
} else throw "TODO"; # get from openprint.com -> drivers -> gutenprint
+3 -3
View File
@@ -34,15 +34,15 @@ let
"armv7l-linux" = "arm32";
};
hplipArch = hplipPlatforms."${stdenv.system}"
or (throw "HPLIP not supported on ${stdenv.system}");
hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" ];
in
assert withPlugin -> builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.system}";
|| throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}";
pythonPackages.buildPythonApplication {
inherit name src;
+3 -3
View File
@@ -36,15 +36,15 @@ let
"armv7l-linux" = "arm32";
};
hplipArch = hplipPlatforms."${stdenv.system}"
or (throw "HPLIP not supported on ${stdenv.system}");
hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}"
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
pluginArches = [ "x86_32" "x86_64" "arm32" ];
in
assert withPlugin -> builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.system}";
|| throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}";
pythonPackages.buildPythonApplication {
inherit name src;