From 2c2f1e37d4374ea61caefd9389927ea03df4ce31 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Aug 2018 15:11:29 -0400 Subject: reewide: Purge all uses `stdenv.system` and top-level `system` It is deprecated and will be removed after 18.09. --- pkgs/development/libraries/java/jzmq/default.nix | 2 +- pkgs/development/libraries/java/swt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/java') diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 7d229d2577a..402f893034b 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zeromq3 jdk ]; preConfigure = '' - ${if stdenv.system == "x86_64-darwin" then + ${if stdenv.hostPlatform.system == "x86_64-darwin" then '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure '' else ""} ''; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 1a7153f99e6..0aa20f8b014 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -16,7 +16,7 @@ let sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; }; }; - metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system}; + metadata = assert platformMap ? ${stdenv.hostPlatform.system}; platformMap.${stdenv.hostPlatform.system}; in stdenv.mkDerivation rec { version = "4.5"; -- cgit 1.4.1