treewide: use isx86 where appropriate

+5 -5
+1 -1
nixos/modules/installer/cd-dvd/iso-image.nix
··· 476 477 isoImage.squashfsCompression = mkOption { 478 default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% " 479 - + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86" 480 # Untested but should also reduce size for these platforms 481 + lib.optionalString isAarch "-Xbcj arm" 482 + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
··· 476 477 isoImage.squashfsCompression = mkOption { 478 default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% " 479 + + lib.optionalString isx86 "-Xbcj x86" 480 # Untested but should also reduce size for these platforms 481 + lib.optionalString isAarch "-Xbcj arm" 482 + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
+1 -1
pkgs/applications/networking/instant-messengers/jami/daemon.nix
··· 48 configureFlags = old.configureFlags 49 ++ (readLinesToList ./config/ffmpeg_args_common) 50 ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) 51 - ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); 52 outputs = [ "out" "doc" ]; 53 meta = old.meta // { 54 # undefined reference to `ff_nlmeans_init_aarch64'
··· 48 configureFlags = old.configureFlags 49 ++ (readLinesToList ./config/ffmpeg_args_common) 50 ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) 51 + ++ lib.optionals stdenv.hostPlatform.isx86 (readLinesToList ./config/ffmpeg_args_x86); 52 outputs = [ "out" "doc" ]; 53 meta = old.meta // { 54 # undefined reference to `ff_nlmeans_init_aarch64'
+1 -1
pkgs/applications/video/handbrake/default.nix
··· 206 ++ optional (!useGtk) "--disable-gtk" 207 ++ optional useFdk "--enable-fdk-aac" 208 ++ optional stdenv.isDarwin "--disable-xcode" 209 - ++ optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden"; 210 211 # NOTE: 2018-12-27: Check NixOS HandBrake test if changing 212 NIX_LDFLAGS = [ "-lx265" ];
··· 206 ++ optional (!useGtk) "--disable-gtk" 207 ++ optional useFdk "--enable-fdk-aac" 208 ++ optional stdenv.isDarwin "--disable-xcode" 209 + ++ optional stdenv.hostPlatform.isx86 "--harden"; 210 211 # NOTE: 2018-12-27: Check NixOS HandBrake test if changing 212 NIX_LDFLAGS = [ "-lx265" ];
+1 -1
pkgs/games/gemrb/default.nix
··· 18 let 19 # the GLES backend on rpi is untested as I don't have the hardware 20 backend = 21 - if (stdenv.isx86_32 || stdenv.isx86_64) then "OpenGL" else "GLES"; 22 23 withVLC = stdenv.isDarwin; 24
··· 18 let 19 # the GLES backend on rpi is untested as I don't have the hardware 20 backend = 21 + if stdenv.hostPlatform.isx86 then "OpenGL" else "GLES"; 22 23 withVLC = stdenv.isDarwin; 24
+1 -1
pkgs/os-specific/linux/nmon/default.nix
··· 13 dontUnpack = true; 14 buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ 15 with stdenv.targetPlatform; 16 - if isx86_32 || isx86_64 then "X86" 17 else if isAarch then "ARM" 18 else if isPower then "POWER" 19 else "UNKNOWN"
··· 13 dontUnpack = true; 14 buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ 15 with stdenv.targetPlatform; 16 + if isx86 then "X86" 17 else if isAarch then "ARM" 18 else if isPower then "POWER" 19 else "UNKNOWN"