diff options
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jami/daemon.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/gemrb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nmon/default.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index f3850a593e90..9309fe70a861 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -476,7 +476,7 @@ in isoImage.squashfsCompression = mkOption { default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% " - + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86" + + lib.optionalString isx86 "-Xbcj x86" # Untested but should also reduce size for these platforms + lib.optionalString isAarch "-Xbcj arm" + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc" diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index 635cc569e86f..f23b22022ebb 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -48,7 +48,7 @@ let configureFlags = old.configureFlags ++ (readLinesToList ./config/ffmpeg_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) - ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); + ++ lib.optionals stdenv.hostPlatform.isx86 (readLinesToList ./config/ffmpeg_args_x86); outputs = [ "out" "doc" ]; meta = old.meta // { # undefined reference to `ff_nlmeans_init_aarch64' diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 3c73e7f59944..d20c6125beb2 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -206,7 +206,7 @@ let self = stdenv.mkDerivation rec { ++ optional (!useGtk) "--disable-gtk" ++ optional useFdk "--enable-fdk-aac" ++ optional stdenv.isDarwin "--disable-xcode" - ++ optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden"; + ++ optional stdenv.hostPlatform.isx86 "--harden"; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing NIX_LDFLAGS = [ "-lx265" ]; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 947957bc3af6..b29eed160cde 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -18,7 +18,7 @@ let # the GLES backend on rpi is untested as I don't have the hardware backend = - if (stdenv.isx86_32 || stdenv.isx86_64) then "OpenGL" else "GLES"; + if stdenv.hostPlatform.isx86 then "OpenGL" else "GLES"; withVLC = stdenv.isDarwin; diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index e3ab199399ec..41c16f9f394c 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontUnpack = true; buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ with stdenv.targetPlatform; - if isx86_32 || isx86_64 then "X86" + if isx86 then "X86" else if isAarch then "ARM" else if isPower then "POWER" else "UNKNOWN" |