diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/sunvox/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/toxic/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2f..47b0bf2e736c 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f23..4934a7374058 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a10687141615..9839aadc9c1f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 @@ -29,7 +29,7 @@ let hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" else if stdenv.isi686 then "i386-softmmu" - else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch32 then "arm-softmmu" else if stdenv.isAarch64 then "aarch64-softmmu" else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; |