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

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

Browse Source 
It is deprecated and will be removed after 18.09.
This commit is contained in:
John Ericson
2018-08-20 15:11:29 -04:00
parent 94f71d800d
commit 2c2f1e37d4
263 changed files with 594 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/base16-builder/default.nix
View File

@@ -11,6 +11,6 @@ let
#
nodePackages = import ./node-packages.nix {
inherit pkgs;
inherit (stdenv) system;
inherit (stdenv.hostPlatform) system;
};
in nodePackages.base16-builder

6
pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
View File

@@ -7,9 +7,9 @@
file included in the tarball */
let arch =
if stdenv.system == "x86_64-linux" then "64"
else if stdenv.system == "i686-linux" then "32"
else throw "Unsupported system ${stdenv.system}";
if stdenv.hostPlatform.system == "x86_64-linux" then "64"
else if stdenv.hostPlatform.system == "i686-linux" then "32"
else throw "Unsupported system ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation rec {
name = "cnijfilter-${version}";

6
pkgs/misc/cups/drivers/kyocera/default.nix
View File

@@ -2,9 +2,9 @@
let
platform =
if stdenv.system == "x86_64-linux" then "64bit"
else if stdenv.system == "i686-linux" then "32bit"
else throw "Unsupported system: ${stdenv.system}";
if stdenv.hostPlatform.system == "x86_64-linux" then "64bit"
else if stdenv.hostPlatform.system == "i686-linux" then "32bit"
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
libPath = lib.makeLibraryPath [ cups ];
in

6
pkgs/misc/cups/drivers/kyodialog3/default.nix
View File

@@ -6,9 +6,9 @@
let
platform =
if stdenv.system == "x86_64-linux" then "64bit"
else if stdenv.system == "i686-linux" then "32bit"
else throw "Unsupported system: ${stdenv.system}";
if stdenv.hostPlatform.system == "x86_64-linux" then "64bit"
else if stdenv.hostPlatform.system == "i686-linux" then "32bit"
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
debPlatform =
if platform == "64bit" then "amd64"
else "i386";

4
pkgs/misc/cups/drivers/samsung/4.01.17.nix
View File

@@ -16,8 +16,8 @@
# Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
# to see what will break when upgrading. Consider a new versioned attribute.
let
installationPath = if stdenv.system == "x86_64-linux" then "x86_64" else "i386";
appendPath = if stdenv.system == "x86_64-linux" then "64" else "";
installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386";
appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else "";
libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
in stdenv.mkDerivation rec {
name = "samsung-UnifiedLinuxDriver-${version}";

2
pkgs/misc/cups/drivers/samsung/default.nix
View File

@@ -2,7 +2,7 @@
let
arch = if stdenv.system == "x86_64-linux"
arch = if stdenv.hostPlatform.system == "x86_64-linux"
then "x86_64"
else "i386";

2
pkgs/misc/drivers/gutenprint/bin.nix
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

6
pkgs/misc/drivers/hplip/3.16.11.nix
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;

6
pkgs/misc/drivers/hplip/default.nix
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;

4
pkgs/misc/emulators/retroarch/cores.nix
View File

@@ -272,7 +272,7 @@ in with stdenv.lib.licenses;
extraBuildInputs = [ libGLU_combined libpng ];
}).override {
buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
buildPhase = "make WITH_DYNAREC=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "x86"}";
};
nestopia = (mkLibRetroCore rec {
@@ -300,7 +300,7 @@ in with stdenv.lib.licenses;
extraBuildInputs = [ libGLU_combined libpng ];
}).override {
buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
buildPhase = "make WITH_DYNAREC=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "x86"}";
};
picodrive = (mkLibRetroCore rec {

4
pkgs/misc/emulators/wine/default.nix
View File

@@ -6,9 +6,9 @@
# };
# Make additional configurations on demand:
# wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
{ lib, system, callPackage,
{ lib, stdenv, callPackage,
wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32",
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
pngSupport ? false,
jpegSupport ? false,