diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 15:11:29 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-30 17:20:32 -0400 |
| commit | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (patch) | |
| tree | 1c0dff3f6483825a9143741bdddca44f35bb4224 /pkgs/tools/security/afl | |
| parent | 94f71d800db2ef7afb9fc8dad9e9aa503bfa2941 (diff) | |
| download | nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.gz nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.bz2 nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.lz nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.xz nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.zst nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.zip | |
reewide: Purge all uses `stdenv.system` and top-level `system`
It is deprecated and will be removed after 18.09.
Diffstat (limited to 'pkgs/tools/security/afl')
| -rw-r--r-- | pkgs/tools/security/afl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/afl/qemu.nix | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index c61cbeb32682..3476606049d1 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -4,9 +4,9 @@ let afl-qemu = callPackage ./qemu.nix {}; - qemu-exe-name = if stdenv.system == "x86_64-linux" then "qemu-x86_64" - else if stdenv.system == "i686-linux" then "qemu-i386" - else throw "afl: no support for ${stdenv.system}!"; + qemu-exe-name = if stdenv.hostPlatform.system == "x86_64-linux" then "qemu-x86_64" + else if stdenv.hostPlatform.system == "i686-linux" then "qemu-i386" + else throw "afl: no support for ${stdenv.hostPlatform.system}!"; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 7637dcf246af..82de6474e598 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -16,9 +16,9 @@ let aflTypesFile = writeText "afl-types.h" (builtins.readFile ./qemu-patches/afl-types.h); - cpuTarget = if stdenv.system == "x86_64-linux" then "x86_64-linux-user" - else if stdenv.system == "i686-linux" then "i386-linux-user" - else throw "afl: no support for ${stdenv.system}!"; + cpuTarget = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux-user" + else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user" + else throw "afl: no support for ${stdenv.hostPlatform.system}!"; in stdenv.mkDerivation rec { name = "afl-${n}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { vde2 texinfo libuuid flex bison lzo snappy autoconf libcap_ng gnutls ] - ++ optionals (hasSuffix "linux" stdenv.system) [ libaio ]; + ++ optionals (hasSuffix "linux" stdenv.hostPlatform.system) [ libaio ]; enableParallelBuilding = true; |