commit 07f29d2db24d7d3fd5095b6da8a06c8675f48af6 · pyrox.dev/nixpkgs

+1 -1

nixos/lib/make-zfs-image.nix

···

       241
       241
        
           pkgs.vmTools.override {

     

       242
       242
        
             rootModules =

     

       243
       243
        
               [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++

     

       244
       244
       -
                 (pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos");

     

       244
       244
       +
                 (pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");

     

       245
       245
        
             kernel = modulesTree;

     

       246
       246
        
           }

     

       247
       247
        
         ).runInLinuxVM (

+1 -1

nixos/lib/qemu-common.nix

···

       17
       17
        
             ''-netdev vde,id=vlan${toString nic},sock="$QEMU_VDE_SOCKET_${toString net}"''

     

       18
       18
        
           ];

     

       19
       19
        
       

     

       20
       20
       -
         qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"

     

       20
       20
       +
         qemuSerialDevice = if pkgs.stdenv.hostPlatform.isx86 then "ttyS0"

     

       21
       21
        
               else if (with pkgs.stdenv.hostPlatform; isAarch32 || isAarch64 || isPower) then "ttyAMA0"

     

       22
       22
        
               else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";

     

       23
       23

+1 -1

nixos/modules/hardware/all-firmware.nix

···

       83
       83
        
               b43Firmware_5_1_138

     

       84
       84
        
               b43Firmware_6_30_163_46

     

       85
       85
        
               b43FirmwareCutter

     

       86
       86
       -
             ] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware;

     

       86
       86
       +
             ] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware;

     

       87
       87
        
           })

     

       88
       88
        
           (mkIf cfg.wirelessRegulatoryDatabase {

     

       89
       89
        
             hardware.firmware = [ pkgs.wireless-regdb ];

+1 -1

nixos/modules/installer/cd-dvd/iso-image.nix

···

       467
       467
        
             throw "Unsupported architecture";

     

       468
       468
        
       

     

       469
       469
        
         # Syslinux (and isolinux) only supports x86-based architectures.

     

       470
       470
       -
         canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;

     

       470
       470
       +
         canx86BiosBoot = pkgs.stdenv.hostPlatform.isx86;

     

       471
       471
        
       

     

       472
       472
        
       in

     

       473
       473

+1 -1

nixos/modules/system/boot/kernel.nix

···

       243
       243
        
                   "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"

     

       244
       244
        
                   "hid_logitech_hidpp" "hid_logitech_dj" "hid_microsoft"

     

       245
       245
        
       

     

       246
       246
       -
                 ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [

     

       246
       246
       +
                 ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [

     

       247
       247
        
                   # Misc. x86 keyboard stuff.

     

       248
       248
        
                   "pcips2" "atkbd" "i8042"

     

       249
       249

+1 -1

nixos/modules/virtualisation/azure-agent.nix

···

       76
       76
        
       

     

       77
       77
        
         config = mkIf cfg.enable {

     

       78
       78
        
           assertions = [ {

     

       79
       79
       -
             assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;

     

       79
       79
       +
             assertion = pkgs.stdenv.hostPlatform.isx86;

     

       80
       80
        
             message = "Azure not currently supported on ${pkgs.stdenv.hostPlatform.system}";

     

       81
       81
        
           } {

     

       82
       82
        
             assertion = config.networking.networkmanager.enable == false;

+2 -2

nixos/modules/virtualisation/qemu-vm.nix

···

       97
       97
        
           imap1 (idx: drive: drive // { device = driveDeviceName idx; });

     

       98
       98
        
       

     

       99
       99
        
         efiPrefix =

     

       100
       100
       -
           if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then "${pkgs.OVMF.fd}/FV/OVMF"

     

       100
       100
       +
           if pkgs.stdenv.hostPlatform.isx86 then "${pkgs.OVMF.fd}/FV/OVMF"

     

       101
       101
        
           else if pkgs.stdenv.isAarch64 then "${pkgs.OVMF.fd}/FV/AAVMF"

     

       102
       102
        
           else throw "No EFI firmware available for platform";

     

       103
       103
        
         efiFirmware = "${efiPrefix}_CODE.fd";

     
···

       833
       833
        
       

     

       834
       834
        
           # FIXME: Consolidate this one day.

     

       835
       835
        
           virtualisation.qemu.options = mkMerge [

     

       836
       836
       -
             (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [

     

       836
       836
       +
             (mkIf pkgs.stdenv.hostPlatform.isx86 [

     

       837
       837
        
               "-usb" "-device usb-tablet,bus=usb-bus.0"

     

       838
       838
        
             ])

     

       839
       839
        
             (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [

+1 -1

nixos/modules/virtualisation/virtualbox-guest.nix

···

       33
       33
        
       

     

       34
       34
        
         config = mkIf cfg.enable (mkMerge [{

     

       35
       35
        
           assertions = [{

     

       36
       36
       -
             assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;

     

       36
       36
       +
             assertion = pkgs.stdenv.hostPlatform.isx86;

     

       37
       37
        
             message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}";

     

       38
       38
        
           }];

     

       39
       39

+1 -1

nixos/modules/virtualisation/vmware-guest.nix

···

       23
       23
        
       

     

       24
       24
        
         config = mkIf cfg.enable {

     

       25
       25
        
           assertions = [ {

     

       26
       26
       -
             assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;

     

       26
       26
       +
             assertion = pkgs.stdenv.hostPlatform.isx86;

     

       27
       27
        
             message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}";

     

       28
       28
        
           } ];

     

       29
       29

+1 -1

nixos/tests/installer.nix

···

       70
       70
        
           let iface = if grubVersion == 1 then "ide" else "virtio";

     

       71
       71
        
               isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);

     

       72
       72
        
               bios  = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd";

     

       73
       73
       -
           in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then

     

       73
       73
       +
           in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then

     

       74
       74
        
             throw "Non-EFI boot methods are only supported on i686 / x86_64"

     

       75
       75
        
           else ''

     

       76
       76
        
             def assemble_qemu_flags():

+1 -1

pkgs/applications/graphics/krita/generic.nix

···

       32
       32
        
           openjpeg opencolorio_1 poppler curl ilmbase

     

       33
       33
        
           qtmultimedia qtx11extras quazip

     

       34
       34
        
           python3Packages.pyqt5

     

       35
       35
       -
         ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;

     

       35
       35
       +
         ] ++ lib.optional stdenv.hostPlatform.isx86 vc;

     

       36
       36
        
       

     

       37
       37
        
         NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]

     

       38
       38
        
           ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy";

+1 -1

pkgs/applications/science/logic/monosat/default.nix

···

       31
       31
        
         # source behind __linux__ check assumes system is also x86 and

     

       32
       32
        
         # tries to disable x86/x87-specific extended precision mode

     

       33
       33
        
         # https://github.com/sambayless/monosat/issues/33

     

       34
       34
       -
         commonPostPatch = lib.optionalString (!(stdenv.isi686 || stdenv.isx86_64)) ''

     

       34
       34
       +
         commonPostPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''

     

       35
       35
        
           substituteInPlace src/monosat/Main.cc \

     

       36
       36
        
             --replace 'defined(__linux__)' '0'

     

       37
       37
        
         '';

+1 -1

pkgs/applications/video/mplayer/default.nix

···

       174
       174
        
                (useUnfreeCodecs && codecs != null && !crossBuild)

     

       175
       175
        
                "--codecsdir=${codecs}"

     

       176
       176
        
           ++ optional

     

       177
       177
       -
                ((stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) && !crossBuild)

     

       177
       177
       +
                (stdenv.hostPlatform.isx86 && !crossBuild)

     

       178
       178
        
                "--enable-runtime-cpudetection"

     

       179
       179
        
           ++ optional fribidiSupport "--enable-fribidi"

     

       180
       180
        
           ++ optional stdenv.isLinux "--enable-vidix"

+1 -1

pkgs/build-support/vm/default.nix

···

       5
       5
        
       , storeDir ? builtins.storeDir

     

       6
       6
        
       , rootModules ?

     

       7
       7
        
           [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]

     

       8
       8
       -
             ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"

     

       8
       8
       +
             ++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos"

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       let

+1 -1

pkgs/desktops/gnome/core/gnome-software/default.nix

···

       37
       37
        
       }:

     

       38
       38
        
       

     

       39
       39
        
       let

     

       40
       40
       -
         withFwupd = stdenv.isx86_64 || stdenv.isi686;

     

       40
       40
       +
         withFwupd = stdenv.hostPlatform.isx86;

     

       41
       41
        
       in

     

       42
       42
        
       

     

       43
       43
        
       stdenv.mkDerivation rec {

+1 -1

pkgs/development/compilers/ocaml/ber-metaocaml.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
          useX11 = stdenv.isi686 || stdenv.isx86_64;

     

       7
       7
       +
          useX11 = stdenv.hostPlatform.isx86;

     

       8
       8
        
          x11deps = [ libX11 xorgproto ];

     

       9
       9
        
          inherit (lib) optionals;

     

       10
       10

+2 -2

pkgs/development/compilers/sbcl/common.nix

···

       2
       2
        
       

     

       3
       3
        
       { lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap

     

       4
       4
        
       , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"

     

       5
       5
       -
       , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)

     

       6
       6
       -
       , linkableRuntime ? (stdenv.isi686 || stdenv.isx86_64)

     

       5
       5
       +
       , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)

     

       6
       6
       +
       , linkableRuntime ? stdenv.hostPlatform.isx86

     

       7
       7
        
       , disableImmobileSpace ? false

     

       8
       8
        
         # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.

     

       9
       9
        
         # Note that the created binaries still need `patchelf --set-interpreter ...`

+2 -2

pkgs/development/interpreters/clisp/default.nix

···

       9
       9
        
       , libffcall

     

       10
       10
        
       , coreutils

     

       11
       11
        
       # build options

     

       12
       12
       -
       , threadSupport ? (stdenv.isi686 || stdenv.isx86_64)

     

       13
       13
       -
       , x11Support ? (stdenv.isi686 || stdenv.isx86_64)

     

       12
       12
       +
       , threadSupport ? stdenv.hostPlatform.isx86

     

       13
       13
       +
       , x11Support ? stdenv.hostPlatform.isx86

     

       14
       14
        
       , dllSupport ? true

     

       15
       15
        
       , withModules ? [

     

       16
       16
        
           "pcre"

+2 -2

pkgs/development/interpreters/clisp/hg.nix

···

       8
       8
        
       , libffi, libffcall, automake

     

       9
       9
        
       , coreutils

     

       10
       10
        
       # build options

     

       11
       11
       -
       , threadSupport ? (stdenv.isi686 || stdenv.isx86_64)

     

       12
       12
       -
       , x11Support ? (stdenv.isi686 || stdenv.isx86_64)

     

       11
       11
       +
       , threadSupport ? stdenv.hostPlatform.isx86

     

       12
       12
       +
       , x11Support ? stdenv.hostPlatform.isx86

     

       13
       13
        
       , dllSupport ? true

     

       14
       14
        
       , withModules ? [

     

       15
       15
        
           "pcre"

+1 -1

pkgs/development/libraries/SDL2_gfx/default.nix

···

       14
       14
        
         buildInputs = [ SDL2 ]

     

       15
       15
        
           ++ lib.optional stdenv.isDarwin darwin.libobjc;

     

       16
       16
        
       

     

       17
       17
       -
         configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")]

     

       17
       17
       +
         configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")]

     

       18
       18
        
            ++ lib.optional stdenv.isDarwin "--disable-sdltest";

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

+1 -1

pkgs/development/libraries/glibc/common.nix

···

       161
       161
        
             "--enable-bind-now"

     

       162
       162
        
             (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include")

     

       163
       163
        
             (lib.enableFeature profilingLibraries "profile")

     

       164
       164
       -
           ] ++ lib.optionals (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isAarch64) [

     

       164
       164
       +
           ] ++ lib.optionals (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) [

     

       165
       165
        
             # This feature is currently supported on

     

       166
       166
        
             # i386, x86_64 and x32 with binutils 2.29 or later,

     

       167
       167
        
             # and on aarch64 with binutils 2.30 or later.

+1 -1

pkgs/development/libraries/libimagequant/default.nix

···

       15
       15
        
           patchShebangs ./configure

     

       16
       16
        
         '';

     

       17
       17
        
       

     

       18
       18
       -
         configureFlags = lib.optionals (!stdenv.isi686 && !stdenv.isx86_64) [ "--disable-sse" ];

     

       18
       18
       +
         configureFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "--disable-sse" ];

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

     

       21
       21
        
           homepage = "https://pngquant.org/lib/";

+1 -1

pkgs/development/libraries/opencolorio/1.x.nix

···

       29
       29
        
           # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517

     

       30
       30
        
           "-DUSE_EXTERNAL_YAML=OFF"

     

       31
       31
        
         ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"

     

       32
       32
       -
           ++ lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF";

     

       32
       32
       +
           ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF";

     

       33
       33
        
       

     

       34
       34
        
         postInstall = ''

     

       35
       35
        
           mkdir -p $bin/bin; mv $out/bin $bin/

+1 -1

pkgs/development/libraries/pcl/default.nix

···

       34
       34
        
       

     

       35
       35
        
         # remove attempt to prevent (x86/x87-specific) extended precision use

     

       36
       36
        
         # when SSE not detected

     

       37
       37
       -
         postPatch = lib.optionalString (!(stdenv.isi686 || stdenv.isx86_64)) ''

     

       37
       37
       +
         postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''

     

       38
       38
        
           sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake

     

       39
       39
        
         '';

     

       40
       40

+1 -1

pkgs/development/libraries/x264/default.nix

···

       37
       37
        
           ++ lib.optional (!stdenv.isi686) "--enable-pic"

     

       38
       38
        
           ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";

     

       39
       39
        
       

     

       40
       40
       -
         nativeBuildInputs = lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686) nasm;

     

       40
       40
       +
         nativeBuildInputs = lib.optional stdenv.hostPlatform.isx86 nasm;

     

       41
       41
        
       

     

       42
       42
        
         meta = with lib; {

     

       43
       43
        
           description = "Library for encoding H264/AVC video streams";

+1 -1

pkgs/development/python-modules/pyqtgraph/default.nix

···

       53
       53
        
           export FONTCONFIG_FILE=${fontsConf}

     

       54
       54
        
         '';

     

       55
       55
        
       

     

       56
       56
       -
         disabledTests = lib.optionals (!(stdenv.isi686 || stdenv.isx86_64)) [

     

       56
       56
       +
         disabledTests = lib.optionals (!stdenv.hostPlatform.isx86) [

     

       57
       57
        
           # small precision-related differences on other architectures,

     

       58
       58
        
           # upstream doesn't consider it serious.

     

       59
       59
        
           # https://github.com/pyqtgraph/pyqtgraph/issues/2110

+1 -1

pkgs/os-specific/linux/fbterm/default.nix

···

       9
       9
        
             sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

     

       10
       10
        
           };

     

       11
       11
        
         buildInputs = [ gpm freetype fontconfig ncurses ]

     

       12
       12
       -
           ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;

     

       12
       12
       +
           ++ lib.optional stdenv.hostPlatform.isx86 libx86;

     

       13
       13
        
       in

     

       14
       14
        
       stdenv.mkDerivation {

     

       15
       15
        
         inherit (s) pname version;

+1 -1

pkgs/os-specific/linux/firmware/fwupd/default.nix

···

       58
       58
        
           setuptools

     

       59
       59
        
         ]);

     

       60
       60
        
       

     

       61
       61
       -
         isx86 = stdenv.isx86_64 || stdenv.isi686;

     

       61
       61
       +
         isx86 = stdenv.hostPlatform.isx86;

     

       62
       62
        
       

     

       63
       63
        
         # Dell isn't supported on Aarch64

     

       64
       64
        
         haveDell = isx86;

+2 -2

pkgs/os-specific/linux/read-edid/default.nix

···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ cmake ];

     

       13
       13
       -
         buildInputs = lib.optional (stdenv.isi686 || stdenv.isx86_64) libx86;

     

       13
       13
       +
         buildInputs = lib.optional stdenv.hostPlatform.isx86 libx86;

     

       14
       14
        
       

     

       15
       15
       -
         cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.isi686 || stdenv.isx86_64 then "ON" else "OFF"}" ];

     

       15
       15
       +
         cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.hostPlatform.isx86 then "ON" else "OFF"}" ];

     

       16
       16
        
       

     

       17
       17
        
         patchPhase = ''

     

       18
       18
        
           substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE'

+1 -1

pkgs/os-specific/linux/rtl8812au/default.nix

···

       28
       28
        
         makeFlags = [

     

       29
       29
        
           "ARCH=${stdenv.hostPlatform.linuxArch}"

     

       30
       30
        
           "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       31
       31
       -
           ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))

     

       31
       31
       +
           ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n"))

     

       32
       32
        
           ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))

     

       33
       33
        
         ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       34
       34
        
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

+1 -1

pkgs/tools/graphics/pngquant/default.nix

···

       14
       14
        
       

     

       15
       15
        
         preConfigure = "patchShebangs .";

     

       16
       16
        
       

     

       17
       17
       -
         configureFlags = lib.optionals (!stdenv.isi686 && !stdenv.isx86_64) [ "--disable-sse" ];

     

       17
       17
       +
         configureFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "--disable-sse" ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ pkg-config ];

     

       20
       20
        
         buildInputs = [ libpng zlib lcms2 ];

+3 -3

pkgs/tools/misc/ipxe/default.nix

···

       9
       9
        
           "bin-x86_64-efi/ipxe.efi" = null;

     

       10
       10
        
           "bin-x86_64-efi/ipxe.efirom" = null;

     

       11
       11
        
           "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb";

     

       12
       12
       -
         } // lib.optionalAttrs (stdenv.isi686 || stdenv.isx86_64) {

     

       12
       12
       +
         } // lib.optionalAttrs stdenv.hostPlatform.isx86 {

     

       13
       13
        
           "bin/ipxe.dsk" = null;

     

       14
       14
        
           "bin/ipxe.usb" = null;

     

       15
       15
        
           "bin/ipxe.iso" = null;

     
···

       30
       30
        
         pname = "ipxe";

     

       31
       31
        
         version = "1.21.1";

     

       32
       32
        
       

     

       33
       33
       -
         nativeBuildInputs = [ perl cdrkit xz openssl gnu-efi mtools ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) syslinux;

     

       33
       33
       +
         nativeBuildInputs = [ perl cdrkit xz openssl gnu-efi mtools ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;

     

       34
       34
        
       

     

       35
       35
        
         src = fetchFromGitHub {

     

       36
       36
        
           owner = "ipxe";

     
···

       46
       46
        
       

     

       47
       47
        
         makeFlags =

     

       48
       48
        
           [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.

     

       49
       49
       -
           ] ++ lib.optionals (stdenv.isi686 || stdenv.isx86_64) [

     

       49
       49
       +
           ] ++ lib.optionals stdenv.hostPlatform.isx86 [

     

       50
       50
        
             "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin"

     

       51
       51
        
             "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32"

     

       52
       52
        
           ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";

+1 -1

pkgs/tools/networking/fastd/default.nix

···

       42
       42
        
         ];

     

       43
       43
        
       

     

       44
       44
        
         # some options are only available on x86

     

       45
       45
       -
         mesonFlags = lib.optionals (!stdenv.isx86_64 && !stdenv.isi686) [

     

       45
       45
       +
         mesonFlags = lib.optionals (!stdenv.hostPlatform.isx86) [

     

       46
       46
        
           "-Dcipher_salsa20_xmm=disabled"

     

       47
       47
        
           "-Dcipher_salsa2012_xmm=disabled"

     

       48
       48
        
           "-Dmac_ghash_pclmulqdq=disabled"

+1 -1

pkgs/tools/security/mkp224o/default.nix

···

       18
       18
        
             variants = [

     

       19
       19
        
               { suffix = "ref10";         configureFlags = ["--enable-ref10"]; }

     

       20
       20
        
               { suffix = "donna";         configureFlags = ["--enable-donna"]; }

     

       21
       21
       -
             ] ++ lib.optionals (stdenv.isi686 || stdenv.isx86_64) [

     

       21
       21
       +
             ] ++ lib.optionals stdenv.hostPlatform.isx86 [

     

       22
       22
        
               { suffix = "donna-sse2";    configureFlags = ["--enable-donna-sse2"]; }

     

       23
       23
        
             ] ++ lib.optionals stdenv.isx86_64 [

     

       24
       24
        
               { suffix = "amd64-51-30k";  configureFlags = ["--enable-amd64-51-30k"]; }

+1 -1

pkgs/top-level/all-packages.nix

···

       11602
       11602
        
           if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: {

     

       11603
       11603
        
             cc = old.cc.override {

     

       11604
       11604
        
               reproducibleBuild = false;

     

       11605
       11605
       -
               profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));

     

       11605
       11605
       +
               profiledCompiler = with stdenv; (!isDarwin && hostPlatform.isx86);

     

       11606
       11606
        
             };

     

       11607
       11607
        
           }) else ccWrapper;

     

       11608
       11608