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:
@@ -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}";
|
||||
|
||||
@@ -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,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";
|
||||
|
||||
@@ -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,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
arch = if stdenv.system == "x86_64-linux"
|
||||
arch = if stdenv.hostPlatform.system == "x86_64-linux"
|
||||
then "x86_64"
|
||||
else "i386";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user