commit e66d2fd89d40eb37979834c934413635d0841646 · pyrox.dev/nixpkgs

+1 -1

lib/generators.nix

···

       378
       378
        
       

     

       379
       379
        
           attr = let attrFilter = name: value: name != "_module" && value != null;

     

       380
       380
        
           in ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList

     

       381
       381
       -
             (name: value: lib.optional (attrFilter name value) [

     

       381
       381
       +
             (name: value: lib.optionals (attrFilter name value) [

     

       382
       382
        
             (key "\t${ind}" name)

     

       383
       383
        
             (expr "\t${ind}" value)

     

       384
       384
        
           ]) x));

+1 -1

nixos/modules/hardware/video/nvidia.nix

···

       261
       261
        
           in optional primeEnabled {

     

       262
       262
        
             name = igpuDriver;

     

       263
       263
        
             display = offloadCfg.enable;

     

       264
       264
       -
             modules = optional (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ];

     

       264
       264
       +
             modules = optionals (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ];

     

       265
       265
        
             deviceSection = ''

     

       266
       266
        
               BusID "${igpuBusId}"

     

       267
       267
        
               ${optionalString (syncCfg.enable && igpuDriver != "amdgpu") ''Option "AccelMethod" "none"''}

+1 -1

nixos/modules/services/misc/ethminer.nix

···

       85
       85
        
         config = mkIf cfg.enable {

     

       86
       86
        
       

     

       87
       87
        
           systemd.services.ethminer = {

     

       88
       88
       -
             path = optional (cfg.toolkit == "cuda") [ pkgs.cudaPackages.cudatoolkit ];

     

       88
       88
       +
             path = optionals (cfg.toolkit == "cuda") [ pkgs.cudaPackages.cudatoolkit ];

     

       89
       89
        
             description = "ethminer ethereum mining service";

     

       90
       90
        
             wantedBy = [ "multi-user.target" ];

     

       91
       91
        
             after = [ "network.target" ];

+1 -1

nixos/modules/services/misc/podgrab.nix

···

       36
       36
        
             };

     

       37
       37
        
             serviceConfig = {

     

       38
       38
        
               DynamicUser = true;

     

       39
       39
       -
               EnvironmentFile = lib.optional (cfg.passwordFile != null) [

     

       39
       39
       +
               EnvironmentFile = lib.optionals (cfg.passwordFile != null) [

     

       40
       40
        
                 cfg.passwordFile

     

       41
       41
        
               ];

     

       42
       42
        
               ExecStart = "${pkgs.podgrab}/bin/podgrab";

+1 -1

nixos/modules/services/networking/hostapd.nix

···

       199
       199
        
       

     

       200
       200
        
           environment.systemPackages =  [ pkgs.hostapd ];

     

       201
       201
        
       

     

       202
       202
       -
           services.udev.packages = optional (cfg.countryCode != null) [ pkgs.crda ];

     

       202
       202
       +
           services.udev.packages = optionals (cfg.countryCode != null) [ pkgs.crda ];

     

       203
       203
        
       

     

       204
       204
        
           systemd.services.hostapd =

     

       205
       205
        
             { description = "hostapd wireless AP";

+2 -2

nixos/modules/services/networking/ntp/chrony.nix

···

       27
       27
        
           ${cfg.extraConfig}

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
       -
         chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}";

     

       30
       30
       +
         chronyFlags = [ "-n" "-m" "-u" "chrony" "-f" "${configFile}" ] ++ cfg.extraFlags;

     

       31
       31
        
       in

     

       32
       32
        
       {

     

       33
       33
        
         options = {

     
···

       166
       166
        
               unitConfig.ConditionCapability = "CAP_SYS_TIME";

     

       167
       167
        
               serviceConfig =

     

       168
       168
        
                 { Type = "simple";

     

       169
       169
       -
                   ExecStart = "${chronyPkg}/bin/chronyd ${chronyFlags}";

     

       169
       169
       +
                   ExecStart = "${chronyPkg}/bin/chronyd ${builtins.toString chronyFlags}";

     

       170
       170
        
       

     

       171
       171
        
                   ProtectHome = "yes";

     

       172
       172
        
                   ProtectSystem = "full";

+2 -2

nixos/modules/services/networking/ntp/ntpd.nix

···

       25
       25
        
           ${cfg.extraConfig}

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
       -
         ntpFlags = "-c ${configFile} -u ntp:ntp ${toString cfg.extraFlags}";

     

       28
       28
       +
         ntpFlags = [ "-c" "${configFile}" "-u" "ntp:ntp" ] ++ cfg.extraFlags;

     

       29
       29
        
       

     

       30
       30
        
       in

     

       31
       31
        
       

     
···

       137
       137
        
                 '';

     

       138
       138
        
       

     

       139
       139
        
               serviceConfig = {

     

       140
       140
       -
                 ExecStart = "@${ntp}/bin/ntpd ntpd -g ${ntpFlags}";

     

       140
       140
       +
                 ExecStart = "@${ntp}/bin/ntpd ntpd -g ${builtins.toString ntpFlags}";

     

       141
       141
        
                 Type = "forking";

     

       142
       142
        
               };

     

       143
       143
        
             };

+2 -2

nixos/modules/services/security/tor.nix

···

       816
       816
        
               always create a container/VM with a separate Tor daemon instance.

     

       817
       817
        
             '' ++

     

       818
       818
        
             flatten (mapAttrsToList (n: o:

     

       819
       819
       -
               optional (o.settings.HiddenServiceVersion == 2) [

     

       819
       819
       +
               optionals (o.settings.HiddenServiceVersion == 2) [

     

       820
       820
        
                 (optional (o.settings.HiddenServiceExportCircuitID != null) ''

     

       821
       821
        
                   HiddenServiceExportCircuitID is used in the HiddenService: ${n}

     

       822
       822
        
                   but this option is only for v3 hidden services.

     

       823
       823
        
                 '')

     

       824
       824
        
               ] ++

     

       825
       825
       -
               optional (o.settings.HiddenServiceVersion != 2) [

     

       825
       825
       +
               optionals (o.settings.HiddenServiceVersion != 2) [

     

       826
       826
        
                 (optional (o.settings.HiddenServiceAuthorizeClient != null) ''

     

       827
       827
        
                   HiddenServiceAuthorizeClient is used in the HiddenService: ${n}

     

       828
       828
        
                   but this option is only for v2 hidden services.

+1 -1

nixos/modules/services/web-apps/netbox.nix

···

       46
       46
        
           '';

     

       47
       47
        
         })).override {

     

       48
       48
        
           plugins = ps: ((cfg.plugins ps)

     

       49
       49
       -
             ++ optional cfg.enableLdap [ ps.django-auth-ldap ]);

     

       49
       49
       +
             ++ optionals cfg.enableLdap [ ps.django-auth-ldap ]);

     

       50
       50
        
         };

     

       51
       51
        
         netboxManageScript = with pkgs; (writeScriptBin "netbox-manage" ''

     

       52
       52
        
           #!${stdenv.shell}

+2 -2

nixos/tests/installed-tests/default.nix

···

       28
       28
        
           , withX11 ? false

     

       29
       29
        
       

     

       30
       30
        
             # Extra flags to pass to gnome-desktop-testing-runner.

     

       31
       31
       -
           , testRunnerFlags ? ""

     

       31
       31
       +
           , testRunnerFlags ? []

     

       32
       32
        
       

     

       33
       33
        
             # Extra attributes to pass to makeTest.

     

       34
       34
        
             # They will be recursively merged into the attrset created by this function.

     
···

       67
       67
        
                   '' +

     

       68
       68
        
                   ''

     

       69
       69
        
                     machine.succeed(

     

       70
       70
       -
                         "gnome-desktop-testing-runner ${testRunnerFlags} -d '${tested.installedTests}/share'"

     

       70
       70
       +
                         "gnome-desktop-testing-runner ${escapeShellArgs testRunnerFlags} -d '${tested.installedTests}/share'"

     

       71
       71
        
                     )

     

       72
       72
        
                   '';

     

       73
       73
        
               }

+1 -1

nixos/tests/installed-tests/flatpak-builder.nix

···

       11
       11
        
           virtualisation.diskSize = 2048;

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         testRunnerFlags = "--timeout 3600";

     

       14
       14
       +
         testRunnerFlags = [ "--timeout" "3600" ];

     

       15
       15
        
       }

+1 -1

nixos/tests/installed-tests/flatpak.nix

···

       13
       13
        
           virtualisation.diskSize = 3072;

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         testRunnerFlags = "--timeout 3600";

     

       16
       16
       +
         testRunnerFlags = [ "--timeout" "3600" ];

     

       17
       17
        
       }

+1 -1

nixos/tests/installed-tests/gdk-pixbuf.nix

···

       9
       9
        
           virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         testRunnerFlags = "--timeout 1800";

     

       12
       12
       +
         testRunnerFlags = [ "--timeout" "1800" ];

     

       13
       13
        
       }

+22 -19

nixos/tests/k3s/multi-node.nix

···

       54
       54
        
                 role = "server";

     

       55
       55
        
                 package = pkgs.k3s;

     

       56
       56
        
                 clusterInit = true;

     

       57
       57
       -
                 extraFlags = ''

     

       58
       58
       -
                   --disable coredns \

     

       59
       59
       -
                   --disable local-storage \

     

       60
       60
       -
                   --disable metrics-server \

     

       61
       61
       -
                   --disable servicelb \

     

       62
       62
       -
                   --disable traefik \

     

       63
       63
       -
                   --node-ip 192.168.1.1 \

     

       64
       64
       -
                   --pause-image test.local/pause:local

     

       65
       65
       -
                 '';

     

       57
       57
       +
                 extraFlags = builtins.toString [

     

       58
       58
       +
                   "--disable" "coredns"

     

       59
       59
       +
                   "--disable" "local-storage"

     

       60
       60
       +
                   "--disable" "metrics-server"

     

       61
       61
       +
                   "--disable" "servicelb"

     

       62
       62
       +
                   "--disable" "traefik"

     

       63
       63
       +
                   "--node-ip" "192.168.1.1"

     

       64
       64
       +
                   "--pause-image" "test.local/pause:local"

     

       65
       65
       +
                 ];

     

       66
       66
        
               };

     

       67
       67
        
               networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ];

     

       68
       68
        
               networking.firewall.allowedUDPPorts = [ 8472 ];

     
···

       84
       84
        
                 enable = true;

     

       85
       85
        
                 serverAddr = "https://192.168.1.1:6443";

     

       86
       86
        
                 clusterInit = false;

     

       87
       87
       -
                 extraFlags = ''

     

       88
       88
       -
                   --disable coredns \

     

       89
       89
       -
                   --disable local-storage \

     

       90
       90
       -
                   --disable metrics-server \

     

       91
       91
       -
                   --disable servicelb \

     

       92
       92
       -
                   --disable traefik \

     

       93
       93
       -
                   --node-ip 192.168.1.3 \

     

       94
       94
       -
                   --pause-image test.local/pause:local

     

       95
       95
       -
                 '';

     

       87
       87
       +
                 extraFlags = builtins.toString [

     

       88
       88
       +
                   "--disable" "coredns"

     

       89
       89
       +
                   "--disable" "local-storage"

     

       90
       90
       +
                   "--disable" "metrics-server"

     

       91
       91
       +
                   "--disable" "servicelb"

     

       92
       92
       +
                   "--disable" "traefik"

     

       93
       93
       +
                   "--node-ip" "192.168.1.3"

     

       94
       94
       +
                   "--pause-image" "test.local/pause:local"

     

       95
       95
       +
                 ];

     

       96
       96
        
               };

     

       97
       97
        
               networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ];

     

       98
       98
        
               networking.firewall.allowedUDPPorts = [ 8472 ];

     
···

       112
       112
        
                 enable = true;

     

       113
       113
        
                 role = "agent";

     

       114
       114
        
                 serverAddr = "https://192.168.1.3:6443";

     

       115
       115
       -
                 extraFlags = "--pause-image test.local/pause:local --node-ip 192.168.1.2";

     

       115
       115
       +
                 extraFlags = lib.toString [

     

       116
       116
       +
                   "--pause-image" "test.local/pause:local"

     

       117
       117
       +
                   "--node-ip" "192.168.1.2"

     

       118
       118
       +
                 ];

     

       116
       119
        
               };

     

       117
       120
        
               networking.firewall.allowedTCPPorts = [ 6443 ];

     

       118
       121
        
               networking.firewall.allowedUDPPorts = [ 8472 ];

+8 -9

nixos/tests/k3s/single-node.nix

···

       40
       40
        
             services.k3s.role = "server";

     

       41
       41
        
             services.k3s.package = pkgs.k3s;

     

       42
       42
        
             # Slightly reduce resource usage

     

       43
       43
       -
             services.k3s.extraFlags = ''

     

       44
       44
       -
               --disable coredns \

     

       45
       45
       -
               --disable local-storage \

     

       46
       46
       -
               --disable metrics-server \

     

       47
       47
       -
               --disable servicelb \

     

       48
       48
       -
               --disable traefik \

     

       49
       49
       -
               --pause-image \

     

       50
       50
       -
               test.local/pause:local

     

       51
       51
       -
             '';

     

       43
       43
       +
             services.k3s.extraFlags = builtins.toString [

     

       44
       44
       +
               "--disable" "coredns"

     

       45
       45
       +
               "--disable" "local-storage"

     

       46
       46
       +
               "--disable" "metrics-server"

     

       47
       47
       +
               "--disable" "servicelb"

     

       48
       48
       +
               "--disable" "traefik"

     

       49
       49
       +
               "--pause-image" "test.local/pause:local"

     

       50
       50
       +
             ];

     

       52
       51
        
       

     

       53
       52
        
             users.users = {

     

       54
       53
        
               noprivs = {

+1 -1

pkgs/applications/audio/chuck/default.nix

···

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ libsndfile ]

     

       17
       17
        
           ++ lib.optional (!stdenv.isDarwin) alsa-lib

     

       18
       18
       -
           ++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ];

     

       18
       18
       +
           ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ];

     

       19
       19
        
       

     

       20
       20
        
         patches = [ ./darwin-limits.patch ];

     

       21
       21

+1 -1

pkgs/applications/audio/grandorgue/default.nix

···

       17
       17
        
         buildInputs = [ fftwFloat alsa-lib zlib wavpack wxGTK31 udev ]

     

       18
       18
        
           ++ lib.optional jackaudioSupport libjack2;

     

       19
       19
        
       

     

       20
       20
       -
         cmakeFlags = lib.optional (!jackaudioSupport) [

     

       20
       20
       +
         cmakeFlags = lib.optionals (!jackaudioSupport) [

     

       21
       21
        
           "-DRTAUDIO_USE_JACK=OFF"

     

       22
       22
        
           "-DRTMIDI_USE_JACK=OFF"

     

       23
       23
        
         ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF";

+1 -1

pkgs/applications/audio/snapcast/default.nix

···

       26
       26
        
           aixlog popl soxr

     

       27
       27
        
         ] ++ lib.optional pulseaudioSupport libpulseaudio

     

       28
       28
        
         ++ lib.optional stdenv.isLinux alsa-lib

     

       29
       29
       -
         ++ lib.optional stdenv.isDarwin [darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.AudioToolbox];

     

       29
       29
       +
         ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.AudioToolbox];

     

       30
       30
        
       

     

       31
       31
        
         TARGET=lib.optionalString stdenv.isDarwin "MACOS";

     

       32
       32

+1 -1

pkgs/applications/blockchains/openethereum/default.nix

···

       38
       38
        
       

     

       39
       39
        
         # Exclude some tests that don't work in the sandbox

     

       40
       40
        
         # - Nat test requires network access

     

       41
       41
       -
         checkFlags = "--skip configuration::tests::should_resolve_external_nat_hosts";

     

       41
       41
       +
         checkFlags = [ "--skip" "configuration::tests::should_resolve_external_nat_hosts" ];

     

       42
       42
        
       

     

       43
       43
        
         meta = with lib; {

     

       44
       44
        
           broken = stdenv.isDarwin;

+1 -1

pkgs/applications/blockchains/polkadot/default.nix

···

       34
       34
        
       

     

       35
       35
        
         cargoSha256 = "sha256-mI8VvTlM9ynstDBC0ubQkzg3D2ZXuWqJGS/Y23D6dU0=";

     

       36
       36
        
       

     

       37
       37
       -
         buildInputs = lib.optional stdenv.isDarwin [ Security ];

     

       37
       37
       +
         buildInputs = lib.optionals stdenv.isDarwin [ Security ];

     

       38
       38
        
       

     

       39
       39
        
         nativeBuildInputs = [ clang ];

     

       40
       40

+2 -2

pkgs/applications/editors/rstudio/default.nix

···

       85
       85
        
             makeWrapper

     

       86
       86
        
             pandoc

     

       87
       87
        
             nodejs

     

       88
       88
       -
           ] ++ lib.optional (!server) [

     

       88
       88
       +
           ] ++ lib.optionals (!server) [

     

       89
       89
        
             copyDesktopItems

     

       90
       90
        
           ];

     

       91
       91
        
       

     
···

       118
       118
        
             "-DQUARTO_ENABLED=FALSE"

     

       119
       119
        
             "-DPANDOC_VERSION=${pandoc.version}"

     

       120
       120
        
             "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"

     

       121
       121
       -
           ] ++ lib.optional (!server) [

     

       121
       121
       +
           ] ++ lib.optionals (!server) [

     

       122
       122
        
             "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"

     

       123
       123
        
           ];

     

       124
       124

+1 -1

pkgs/applications/editors/vim/configurable.nix

···

       109
       109
        
         ++ lib.optionals luaSupport [

     

       110
       110
        
           "--with-lua-prefix=${lua}"

     

       111
       111
        
           "--enable-luainterp"

     

       112
       112
       -
         ] ++ lib.optional lua.pkgs.isLuaJIT [

     

       112
       112
       +
         ] ++ lib.optionals lua.pkgs.isLuaJIT [

     

       113
       113
        
           "--with-luajit"

     

       114
       114
        
         ]

     

       115
       115
        
         ++ lib.optionals pythonSupport [

+1 -1

pkgs/applications/editors/vscode/generic.nix

···

       66
       66
        
           buildInputs = [ libsecret libXScrnSaver libxshmfence ]

     

       67
       67
        
             ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages);

     

       68
       68
        
       

     

       69
       69
       -
           runtimeDependencies = lib.optional stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];

     

       69
       69
       +
           runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];

     

       70
       70
        
       

     

       71
       71
        
           nativeBuildInputs = [ unzip ]

     

       72
       72
        
             ++ lib.optionals stdenv.isLinux [

+1 -1

pkgs/applications/emulators/retroarch/cores.nix

···

       676
       676
        
           description = "Fast MegaDrive/MegaCD/32X emulator";

     

       677
       677
        
           license = "MAME";

     

       678
       678
        
           dontConfigure = true;

     

       679
       679
       -
           makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];

     

       679
       679
       +
           makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];

     

       680
       680
        
         };

     

       681
       681
        
       

     

       682
       682
        
         play = mkLibRetroCore {

+2 -2

pkgs/applications/file-managers/nnn/default.nix

···

       40
       40
        
         NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts";

     

       41
       41
        
       

     

       42
       42
        
         makeFlags = [ "PREFIX=${placeholder "out"}" ]

     

       43
       43
       -
           ++ lib.optional withIcons [ "O_ICONS=1" ]

     

       44
       44
       -
           ++ lib.optional withNerdIcons [ "O_NERD=1" ];

     

       43
       43
       +
           ++ lib.optionals withIcons [ "O_ICONS=1" ]

     

       44
       44
       +
           ++ lib.optionals withNerdIcons [ "O_NERD=1" ];

     

       45
       45
        
       

     

       46
       46
        
         binPath = lib.makeBinPath [ file which ];

     

       47
       47

+1 -1

pkgs/applications/gis/gmt/default.nix

···

       47
       47
        
           "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE"

     

       48
       48
        
           "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid

     

       49
       49
        
         ] ++ (with stdenv;

     

       50
       50
       -
           lib.optional (!isDarwin) [

     

       50
       50
       +
           lib.optionals (!isDarwin) [

     

       51
       51
        
             "-DFFTW3_ROOT=${fftwSinglePrec.dev}"

     

       52
       52
        
             "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so"

     

       53
       53
        
             "-DBLAS_LIBRARY=${blas}/lib/libblas.so"

+1 -1

pkgs/applications/graphics/kcc/default.nix

···

       23
       23
        
           raven

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
       -
         qtWrapperArgs = lib.optional archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ];

     

       26
       26
       +
         qtWrapperArgs = lib.optionals archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ];

     

       27
       27
        
       

     

       28
       28
        
         postFixup =  ''

     

       29
       29
        
           wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}"

+1 -1

pkgs/applications/graphics/xournalpp/default.nix

···

       48
       48
        
           ]

     

       49
       49
        
           ++ lib.optional withLua lua;

     

       50
       50
        
       

     

       51
       51
       -
         buildFlags = "translations";

     

       51
       51
       +
         buildFlags = [ "translations" ];

     

       52
       52
        
       

     

       53
       53
        
         hardeningDisable = [ "format" ];

     

       54
       54

+1 -1

pkgs/applications/misc/audio/sox/default.nix

···

       47
       47
        
         nativeBuildInputs = [

     

       48
       48
        
           autoreconfHook

     

       49
       49
        
           autoconf-archive

     

       50
       50
       -
         ] ++ lib.optional enableOpusfile [

     

       50
       50
       +
         ] ++ lib.optionals enableOpusfile [

     

       51
       51
        
           # configure.ac uses pkg-config only to locate libopusfile

     

       52
       52
        
           pkg-config

     

       53
       53
        
         ];

+1 -1

pkgs/applications/misc/blender/default.nix

···

       127
       127
        
           # Clang doesn't support "-export-dynamic"

     

       128
       128
        
           ++ optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS="

     

       129
       129
        
           ++ optional jackaudioSupport "-DWITH_JACK=ON"

     

       130
       130
       -
           ++ optional cudaSupport [

     

       130
       130
       +
           ++ optionals cudaSupport [

     

       131
       131
        
             "-DWITH_CYCLES_CUDA_BINARIES=ON"

     

       132
       132
        
             "-DWITH_CYCLES_DEVICE_OPTIX=ON"

     

       133
       133
        
             "-DOPTIX_ROOT_DIR=${optix}"

+1 -1

pkgs/applications/networking/browsers/links2/default.nix

···

       20
       20
        
           [ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ]

     

       21
       21
        
           ++ optionals stdenv.isLinux [ gpm ]

     

       22
       22
        
           ++ optionals enableX11 [ libX11 libXau libXt ]

     

       23
       23
       -
           ++ optional enableDirectFB [ directfb ];

     

       23
       23
       +
           ++ optionals enableDirectFB [ directfb ];

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ pkg-config bzip2 ];

     

       26
       26

+1 -1

pkgs/applications/networking/cluster/hadoop/default.nix

···

       37
       37
        
             doCheck = true;

     

       38
       38
        
       

     

       39
       39
        
             nativeBuildInputs = [ makeWrapper ]

     

       40
       40
       -
               ++ optional (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ];

     

       40
       40
       +
               ++ optionals (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ];

     

       41
       41
        
             buildInputs = [ openssl ] ++ nativeLibs;

     

       42
       42
        
       

     

       43
       43
        
             installPhase = ''

+1 -1

pkgs/applications/networking/firehol/default.nix

···

       43
       43
        
         configureFlags = [ "--localstatedir=/var"

     

       44
       44
        
                            "--disable-doc" "--disable-man"

     

       45
       45
        
                            "--disable-update-ipsets" ] ++

     

       46
       46
       -
                          lib.optional onlyQOS [ "--disable-firehol" ];

     

       46
       46
       +
                          lib.optionals onlyQOS [ "--disable-firehol" ];

     

       47
       47
        
       

     

       48
       48
        
         meta = with lib; {

     

       49
       49
        
           description = "A firewall for humans";

+1 -1

pkgs/applications/networking/instant-messengers/pantalaimon/default.nix

···

       34
       34
        
           peewee

     

       35
       35
        
           prompt-toolkit

     

       36
       36
        
           setuptools

     

       37
       37
       -
         ] ++ lib.optional enableDbusUi [

     

       37
       37
       +
         ] ++ lib.optionals enableDbusUi [

     

       38
       38
        
             dbus-python

     

       39
       39
        
             notify2

     

       40
       40
        
             pygobject3

+1 -1

pkgs/applications/networking/irc/convos/default.nix

···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ makeWrapper ]

     

       19
       19
       -
           ++ optional stdenv.isDarwin [ shortenPerlShebang ];

     

       19
       19
       +
           ++ optionals stdenv.isDarwin [ shortenPerlShebang ];

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = with perlPackages; [

     

       22
       22
        
           CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt

+1 -1

pkgs/applications/networking/mailreaders/alot/default.nix

···

       15
       15
        
       

     

       16
       16
        
         outputs = [

     

       17
       17
        
           "out"

     

       18
       18
       -
         ] ++ lib.optional withManpage [

     

       18
       18
       +
         ] ++ lib.optionals withManpage [

     

       19
       19
        
           "man"

     

       20
       20
        
         ];

     

       21
       21

+1 -1

pkgs/applications/networking/mailreaders/meli/default.nix

···

       31
       31
        
       

     

       32
       32
        
         checkInputs = [ file ];

     

       33
       33
        
       

     

       34
       34
       -
         buildFeatures = lib.optional withNotmuch [ "notmuch" ];

     

       34
       34
       +
         buildFeatures = lib.optionals withNotmuch [ "notmuch" ];

     

       35
       35
        
       

     

       36
       36
        
         postInstall = ''

     

       37
       37
        
           mkdir -p $out/share/man/man1

+2 -2

pkgs/applications/networking/mpop/default.nix

···

       25
       25
        
           gnutls

     

       26
       26
        
           gsasl

     

       27
       27
        
           libidn

     

       28
       28
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       28
       28
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       29
       29
        
           Security

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
       -
         configureFlags = lib.optional stdenv.isDarwin [

     

       32
       32
       +
         configureFlags = lib.optionals stdenv.isDarwin [

     

       33
       33
        
           "--with-macosx-keyring"

     

       34
       34
        
         ];

     

       35
       35

+1 -1

pkgs/applications/networking/sync/lsyncd/default.nix

···

       27
       27
        
       

     

       28
       28
        
         # Special flags needed on Darwin:

     

       29
       29
        
         # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51

     

       30
       30
       -
         cmakeFlags = lib.optional stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ];

     

       30
       30
       +
         cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" ];

     

       31
       31
        
       

     

       32
       32
        
         dontUseCmakeBuildDir = true;

     

       33
       33

+2 -2

pkgs/applications/networking/znc/default.nix

···

       36
       36
        
           (lib.enableFeature withTcl "tcl")

     

       37
       37
        
           (lib.withFeatureAs withTcl "tcl" "${tcl}/lib")

     

       38
       38
        
           (lib.enableFeature withCyrus "cyrus")

     

       39
       39
       -
         ] ++ optional (!withIPv6) [ "--disable-ipv6" ]

     

       40
       40
       -
           ++ optional withDebug [ "--enable-debug" ];

     

       39
       39
       +
         ] ++ optionals (!withIPv6) [ "--disable-ipv6" ]

     

       40
       40
       +
           ++ optionals withDebug [ "--enable-debug" ];

     

       41
       41
        
       

     

       42
       42
        
         enableParallelBuilding = true;

     

       43
       43

+1 -1

pkgs/applications/radio/rtl-sdr/default.nix

···

       29
       29
        
       

     

       30
       30
        
         buildInputs = [ libusb1 ];

     

       31
       31
        
       

     

       32
       32
       -
         cmakeFlags = lib.optional stdenv.isLinux [

     

       32
       32
       +
         cmakeFlags = lib.optionals stdenv.isLinux [

     

       33
       33
        
           "-DINSTALL_UDEV_RULES=ON"

     

       34
       34
        
           "-DWITH_RPC=ON"

     

       35
       35
        
         ];

+1 -1

pkgs/applications/science/biology/megahit/default.nix

···

       14
       14
        
         nativeBuildInputs = [ cmake ];

     

       15
       15
        
         buildInputs = [ zlib ];

     

       16
       16
        
       

     

       17
       17
       -
         cmakeFlags = lib.optional stdenv.hostPlatform.isStatic [

     

       17
       17
       +
         cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [

     

       18
       18
        
           "-DSTATIC_BUILD=ON"

     

       19
       19
        
           ];

     

       20
       20
        
         meta = with lib; {

+1 -1

pkgs/applications/science/biology/neuron/default.nix

···

       26
       26
        
           sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         patches = (lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]);

     

       29
       29
       +
         patches = (lib.optionals (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]);

     

       30
       30
        
       

     

       31
       31
        
         # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these...

     

       32
       32
        
         postPatch = lib.optionalString stdenv.cc.isClang ''

+1 -1

pkgs/applications/science/biology/samtools/default.nix

···

       32
       32
        
       

     

       33
       33
        
         configureFlags = [ "--with-htslib=${htslib}" ]

     

       34
       34
        
           ++ lib.optional (ncurses == null) "--without-curses"

     

       35
       35
       -
           ++ lib.optional stdenv.hostPlatform.isStatic ["--without-curses" ]

     

       35
       35
       +
           ++ lib.optionals stdenv.hostPlatform.isStatic ["--without-curses" ]

     

       36
       36
        
           ;

     

       37
       37
        
       

     

       38
       38
        
         preCheck = ''

+1 -1

pkgs/applications/science/logic/fast-downward/default.nix

···

       21
       21
        
         nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];

     

       22
       22
        
         buildInputs = [ python3 osi ];

     

       23
       23
        
       

     

       24
       24
       -
         cmakeFlags = lib.optional osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ];

     

       24
       24
       +
         cmakeFlags = lib.optionals osi.withCplex [ "-DDOWNWARD_CPLEX_ROOT=${cplex}/cplex" ];

     

       25
       25
        
       

     

       26
       26
        
         configurePhase = ''

     

       27
       27
        
           python build.py release

+1 -1

pkgs/applications/science/math/ratpoints/default.nix

···

       20
       20
        
         buildInputs = [ gmp ];

     

       21
       21
        
       

     

       22
       22
        
         makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

     

       23
       23
       -
         buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"];

     

       23
       23
       +
         buildFlags = lib.optionals stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"];

     

       24
       24
        
         installFlags = [ "INSTALL_DIR=$(out)" ];

     

       25
       25
        
       

     

       26
       26
        
         preInstall = ''mkdir -p "$out"/{bin,share,lib,include}'';

+1 -1

pkgs/applications/terminal-emulators/x3270/default.nix

···

       18
       18
        
           sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildFlags = "unix";

     

       21
       21
       +
         buildFlags = [ "unix" ];

     

       22
       22
        
       

     

       23
       23
        
         postConfigure = ''

     

       24
       24
        
           pushd c3270 ; ./configure ; popd

+2 -2

pkgs/applications/version-management/datalad/default.nix

···

       59
       59
        
       

     

       60
       60
        
           # python>=3.8

     

       61
       61
        
           distro

     

       62
       62
       -
         ] ++ lib.optional stdenv.hostPlatform.isWindows [ colorama ]

     

       63
       63
       -
           ++ lib.optional (python3.pythonOlder "3.10") [ importlib-metadata ];

     

       62
       62
       +
         ] ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]

     

       63
       63
       +
           ++ lib.optionals (python3.pythonOlder "3.10") [ importlib-metadata ];

     

       64
       64
        
       

     

       65
       65
        
         postInstall = ''

     

       66
       66
        
           installShellCompletion --cmd datalad \

+4 -4

pkgs/applications/version-management/dvc/default.nix

···

       72
       72
        
           typing-extensions

     

       73
       73
        
           voluptuous

     

       74
       74
        
           zc_lockfile

     

       75
       75
       -
         ] ++ lib.optional enableGoogle [

     

       75
       75
       +
         ] ++ lib.optionals enableGoogle [

     

       76
       76
        
           gcsfs

     

       77
       77
        
           google-cloud-storage

     

       78
       78
       -
         ] ++ lib.optional enableAWS [

     

       78
       78
       +
         ] ++ lib.optionals enableAWS [

     

       79
       79
        
           aiobotocore

     

       80
       80
        
           boto3

     

       81
       81
        
           s3fs

     

       82
       82
       -
         ] ++ lib.optional enableAzure [

     

       82
       82
       +
         ] ++ lib.optionals enableAzure [

     

       83
       83
        
           azure-identity

     

       84
       84
        
           knack

     

       85
       85
       -
         ] ++ lib.optional enableSSH [

     

       85
       85
       +
         ] ++ lib.optionals enableSSH [

     

       86
       86
        
           bcrypt

     

       87
       87
        
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       88
       88
        
           importlib-metadata

+1 -1

pkgs/applications/version-management/git-and-tools/tig/default.nix

···

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];

     

       17
       17
        
       

     

       18
       18
       -
         autoreconfFlags = "-I tools -v";

     

       18
       18
       +
         autoreconfFlags = [ "-I" "tools" "-v" ];

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ ncurses readline git ]

     

       21
       21
        
           ++ lib.optionals stdenv.isDarwin [ libiconv ];

+1 -1

pkgs/applications/version-management/gitlab/default.nix

···

       37
       37
        
               railties = x.railties // {

     

       38
       38
        
                 dontBuild = false;

     

       39
       39
        
                 patches = [ ./railties-remove-yarn-install-enhancement.patch ];

     

       40
       40
       -
                 patchFlags = "-p2";

     

       40
       40
       +
                 patchFlags = [ "-p2" ];

     

       41
       41
        
               };

     

       42
       42
        
             };

     

       43
       43
        
           groups = [

+1 -1

pkgs/applications/version-management/subversion/default.nix

···

       40
       40
        
             ++ lib.optionals pythonBindings [ python3 py3c ]

     

       41
       41
        
             ++ lib.optional perlBindings perl

     

       42
       42
        
             ++ lib.optional saslSupport sasl

     

       43
       43
       -
             ++ lib.optional stdenv.hostPlatform.isDarwin [ CoreServices Security ];

     

       43
       43
       +
             ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ];

     

       44
       44
        
       

     

       45
       45
        
           patches = [ ./apr-1.patch ] ++ extraPatches;

     

       46
       46

+3 -3

pkgs/applications/video/kodi/unwrapped.nix

···

       138
       138
        
             lirc

     

       139
       139
        
             mesa # for libEGL

     

       140
       140
        
           ]

     

       141
       141
       -
           ++ lib.optional x11Support [

     

       141
       141
       +
           ++ lib.optionals x11Support [

     

       142
       142
        
             libX11 xorgproto libXt libXmu libXext.dev libXdmcp

     

       143
       143
        
             libXinerama libXrandr.dev libXtst libXfixes

     

       144
       144
        
           ]

     
···

       158
       158
        
             # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise

     

       159
       159
        
             libxkbcommon.dev

     

       160
       160
        
           ]

     

       161
       161
       -
           ++ lib.optional gbmSupport [

     

       161
       161
       +
           ++ lib.optionals gbmSupport [

     

       162
       162
        
             libxkbcommon.dev

     

       163
       163
        
             mesa.dev

     

       164
       164
        
             libinput.dev

     
···

       200
       200
        
             # whitelisted directories). This adds the entire nix store to the Kodi

     

       201
       201
        
             # webserver whitelist to avoid this problem.

     

       202
       202
        
             "-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}"

     

       203
       203
       -
           ] ++ lib.optional waylandSupport [

     

       203
       203
       +
           ] ++ lib.optionals waylandSupport [

     

       204
       204
        
             "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"

     

       205
       205
        
           ];

     

       206
       206

+1 -1

pkgs/build-support/release/default.nix

···

       15
       15
        
           } // args);

     

       16
       16
        
       

     

       17
       17
        
         mvnBuild = args: import ./maven-build.nix (

     

       18
       18
       -
           { inherit stdenv;

     

       18
       18
       +
           { inherit lib stdenv;

     

       19
       19
        
           } // args);

     

       20
       20
        
       

     

       21
       21
        
         nixBuild = args: import ./nix-build.nix (

+6 -1

pkgs/build-support/release/maven-build.nix

···

       1
       1
        
       { stdenv

     

       2
       2
       +
       , lib

     

       2
       3
        
       , name

     

       3
       4
        
       , src

     

       4
       5
        
       , doTest ? true

     
···

       12
       13
        
       } @ args :

     

       13
       14
        
       

     

       14
       15
        
       let

     

       15
       15
       -
         mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}";

     

       16
       16
       +
         mvnFlags = lib.escapeShellArgs [

     

       17
       17
       +
           "-Dmaven.repo.local=$M2_REPO"

     

       18
       18
       +
           (lib.optionalString (!doTest) "-Dmaven.test.skip.exec=true")

     

       19
       19
       +
           "${extraMvnFlags}"

     

       20
       20
       +
         ];

     

       16
       21
        
       in

     

       17
       22
        
       

     

       18
       23
        
       stdenv.mkDerivation ( {

+1 -1

pkgs/build-support/skaware/build-skaware-package.nix

···

       87
       87
        
       

     

       88
       88
        
         inherit postConfigure;

     

       89
       89
        
       

     

       90
       90
       -
         makeFlags = lib.optional stdenv.cc.isClang [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ];

     

       90
       90
       +
         makeFlags = lib.optionals stdenv.cc.isClang [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ];

     

       91
       91
        
       

     

       92
       92
        
         # TODO(Profpatsch): ensure that there is always a $doc output!

     

       93
       93
        
         postInstall = ''

+1 -1

pkgs/data/fonts/iosevka/default.nix

···

       86
       86
        
         inherit extraParameters;

     

       87
       87
        
         passAsFile = [

     

       88
       88
        
           "extraParameters"

     

       89
       89
       -
         ] ++ lib.optional (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [

     

       89
       89
       +
         ] ++ lib.optionals (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [

     

       90
       90
        
           "buildPlan"

     

       91
       91
        
         ];

     

       92
       92

+1 -1

pkgs/desktops/gnome-2/platform/GConf/default.nix

···

       22
       22
        
       

     

       23
       23
        
         configureFlags =

     

       24
       24
        
           # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin

     

       25
       25
       -
           lib.optional stdenv.isDarwin [ "--enable-static" ];

     

       25
       25
       +
           lib.optionals stdenv.isDarwin [ "--enable-static" ];

     

       26
       26
        
       

     

       27
       27
        
         postPatch = ''

     

       28
       28
        
           2to3 --write --nobackup gsettings/gsettings-schema-convert

+1 -1

pkgs/development/compilers/dmd/default.nix

···

       129
       129
        
         nativeBuildInputs = [ makeWrapper unzip which git ];

     

       130
       130
        
       

     

       131
       131
        
         buildInputs = [ gdb curl tzdata ]

     

       132
       132
       -
           ++ lib.optional stdenv.isDarwin [ Foundation gdb ];

     

       132
       132
       +
           ++ lib.optionals stdenv.isDarwin [ Foundation gdb ];

     

       133
       133
        
       

     

       134
       134
        
       

     

       135
       135
        
         osname = if stdenv.isDarwin then

+1 -1

pkgs/development/compilers/edk2/default.nix

···

       61
       61
        
         ${"GCC5_${targetArch}_PREFIX"}=stdenv.cc.targetPrefix;

     

       62
       62
        
       

     

       63
       63
        
         makeFlags = [ "-C BaseTools" ]

     

       64
       64
       -
           ++ lib.optional (stdenv.cc.isClang) [ "BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang" ];

     

       64
       64
       +
           ++ lib.optionals (stdenv.cc.isClang) [ "BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang" ];

     

       65
       65
        
       

     

       66
       66
        
         NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation";

     

       67
       67

+1 -1

pkgs/development/compilers/gforth/boot-forth.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ m4 ];

     

       15
       15
        
       

     

       16
       16
       -
         configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];

     

       16
       16
       +
         configureFlags = lib.optionals stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];

     

       17
       17
        
       

     

       18
       18
        
         meta = {

     

       19
       19
        
           description = "The Forth implementation of the GNU project (outdated version used to bootstrap)";

+1 -1

pkgs/development/compilers/ghdl/default.nix

···

       38
       38
        
         ];

     

       39
       39
        
         buildInputs = [

     

       40
       40
        
           zlib

     

       41
       41
       -
         ] ++ lib.optional (backend == "llvm") [

     

       41
       41
       +
         ] ++ lib.optionals (backend == "llvm") [

     

       42
       42
        
           llvm

     

       43
       43
        
         ];

     

       44
       44
        
         propagatedBuildInputs = [

+1 -1

pkgs/development/compilers/idris2/default.nix

···

       34
       34
        
       

     

       35
       35
        
         strictDeps = true;

     

       36
       36
        
         nativeBuildInputs = [ makeWrapper clang platformChez ]

     

       37
       37
       -
           ++ lib.optional stdenv.isDarwin [ zsh ];

     

       37
       37
       +
           ++ lib.optionals stdenv.isDarwin [ zsh ];

     

       38
       38
        
         buildInputs = [ platformChez gmp ];

     

       39
       39
        
       

     

       40
       40
        
         prePatch = ''

+1 -1

pkgs/development/compilers/idris2/tests.nix

···

       11
       11
        
             # is not the case with pure nix environments. Thus, we need to include zsh

     

       12
       12
        
             # when we build for darwin in tests. While this is impure, this is also what

     

       13
       13
        
             # we find in real darwin hosts.

     

       14
       14
       -
             nativeBuildInputs = lib.optional stdenv.isDarwin [ zsh ];

     

       14
       14
       +
             nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ];

     

       15
       15
        
       

     

       16
       16
        
             buildCommand = ''

     

       17
       17
        
               set -eo pipefail

+1 -1

pkgs/development/compilers/llvm/10/libcxx/default.nix

···

       45
       45
        
           "-DLIBCXX_CXX_ABI=libcxxabi"

     

       46
       46
        
         ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"

     

       47
       47
        
           ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"

     

       48
       48
       -
           ++ lib.optional stdenv.hostPlatform.isWasm [

     

       48
       48
       +
           ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       49
       49
        
             "-DLIBCXX_ENABLE_THREADS=OFF"

     

       50
       50
        
             "-DLIBCXX_ENABLE_FILESYSTEM=OFF"

     

       51
       51
        
             "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

+1 -1

pkgs/development/compilers/llvm/11/libcxx/default.nix

···

       48
       48
        
           "-DLIBCXX_CXX_ABI=libcxxabi"

     

       49
       49
        
         ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"

     

       50
       50
        
           ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"

     

       51
       51
       -
           ++ lib.optional stdenv.hostPlatform.isWasm [

     

       51
       51
       +
           ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       52
       52
        
             "-DLIBCXX_ENABLE_THREADS=OFF"

     

       53
       53
        
             "-DLIBCXX_ENABLE_FILESYSTEM=OFF"

     

       54
       54
        
             "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

+1 -1

pkgs/development/compilers/llvm/12/libcxx/default.nix

···

       36
       36
        
           "-DLIBCXX_CXX_ABI=libcxxabi"

     

       37
       37
        
         ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"

     

       38
       38
        
           ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"

     

       39
       39
       -
           ++ lib.optional stdenv.hostPlatform.isWasm [

     

       39
       39
       +
           ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       40
       40
        
             "-DLIBCXX_ENABLE_THREADS=OFF"

     

       41
       41
        
             "-DLIBCXX_ENABLE_FILESYSTEM=OFF"

     

       42
       42
        
             "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

+1 -1

pkgs/development/compilers/llvm/8/libcxx/default.nix

···

       49
       49
        
           "-DLIBCXX_CXX_ABI=libcxxabi"

     

       50
       50
        
         ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"

     

       51
       51
        
           ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"

     

       52
       52
       -
           ++ lib.optional stdenv.hostPlatform.isWasm [

     

       52
       52
       +
           ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       53
       53
        
             "-DLIBCXX_ENABLE_THREADS=OFF"

     

       54
       54
        
             "-DLIBCXX_ENABLE_FILESYSTEM=OFF"

     

       55
       55
        
             "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

+1 -1

pkgs/development/compilers/llvm/9/libcxx/default.nix

···

       45
       45
        
           "-DLIBCXX_CXX_ABI=libcxxabi"

     

       46
       46
        
         ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"

     

       47
       47
        
           ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"

     

       48
       48
       -
           ++ lib.optional stdenv.hostPlatform.isWasm [

     

       48
       48
       +
           ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       49
       49
        
             "-DLIBCXX_ENABLE_THREADS=OFF"

     

       50
       50
        
             "-DLIBCXX_ENABLE_FILESYSTEM=OFF"

     

       51
       51
        
             "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"

+1 -1

pkgs/development/compilers/manticore/default.nix

···

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ coreutils smlnj ];

     

       21
       21
        
       

     

       22
       22
       -
         autoreconfFlags = "-Iconfig -vfi";

     

       22
       22
       +
         autoreconfFlags = [ "-Iconfig" "-vfi" ];

     

       23
       23
        
       

     

       24
       24
        
         unpackPhase = ''

     

       25
       25
        
           mkdir -p $out

+1 -1

pkgs/development/compilers/orc/default.nix

···

       26
       26
        
         outputBin = "dev"; # compilation tools

     

       27
       27
        
       

     

       28
       28
        
         mesonFlags =

     

       29
       29
       -
           optional (!buildDevDoc) [ "-Dgtk_doc=disabled" ]

     

       29
       29
       +
           optionals (!buildDevDoc) [ "-Dgtk_doc=disabled" ]

     

       30
       30
        
         ;

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [ meson ninja ]

+2 -2

pkgs/development/compilers/p4c/default.nix

···

       66
       66
        
           flex

     

       67
       67
        
           cmake

     

       68
       68
        
         ]

     

       69
       69
       -
         ++ lib.optional enableDocumentation [ doxygen graphviz ]

     

       70
       70
       -
         ++ lib.optional enableBPF [ libllvm libbpf ];

     

       69
       69
       +
         ++ lib.optionals enableDocumentation [ doxygen graphviz ]

     

       70
       70
       +
         ++ lib.optionals enableBPF [ libllvm libbpf ];

     

       71
       71
        
       

     

       72
       72
        
         buildInputs = [

     

       73
       73
        
           protobuf

+1 -1

pkgs/development/compilers/sbcl/2.x.nix

···

       153
       153
        
           optional (!threadSupport) "sb-thread" ++

     

       154
       154
        
           optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];

     

       155
       155
        
       

     

       156
       156
       -
         NIX_CFLAGS_COMPILE = lib.optional (lib.versionOlder version "2.1.10") [

     

       156
       156
       +
         NIX_CFLAGS_COMPILE = lib.optionals (lib.versionOlder version "2.1.10") [

     

       157
       157
        
           # Workaround build failure on -fno-common toolchains like upstream

     

       158
       158
        
           # clang-13. Without the change build fails as:

     

       159
       159
        
           #   duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o

+1 -1

pkgs/development/coq-modules/coq-record-update/default.nix

···

       10
       10
        
         release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk=";

     

       11
       11
        
         release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z";

     

       12
       12
        
         releaseRev = v: "v${v}";

     

       13
       13
       -
         buildFlags = "NO_TEST=1";

     

       13
       13
       +
         buildFlags = [ "NO_TEST=1" ];

     

       14
       14
        
         meta = {

     

       15
       15
        
           description = "Library to create Coq record update functions";

     

       16
       16
        
           maintainers = with maintainers; [ ineol ];

+1 -1

pkgs/development/interpreters/acl2/default.nix

···

       77
       77
        
         '';

     

       78
       78
        
       

     

       79
       79
        
         preBuild = "mkdir -p $HOME";

     

       80
       80
       -
         makeFlags = "LISP=${sbcl}/bin/sbcl ACL2_MAKE_LOG=NONE";

     

       80
       80
       +
         makeFlags = [ "LISP=${sbcl}/bin/sbcl" "ACL2_MAKE_LOG=NONE" ];

     

       81
       81
        
       

     

       82
       82
        
         doCheck = true;

     

       83
       83
        
         checkTarget = "mini-proveall";

+3 -3

pkgs/development/interpreters/kerf/default.nix

···

       18
       18
        
       

     

       19
       19
        
         sourceRoot = "source/src";

     

       20
       20
        
         buildInputs = [ libedit zlib ncurses ]

     

       21
       21
       -
           ++ lib.optional stdenv.isDarwin ([

     

       21
       21
       +
           ++ lib.optionals stdenv.isDarwin ([

     

       22
       22
        
             Accelerate

     

       23
       23
       -
           ] ++ lib.optional stdenv.isx86_64 /* && isDarwin */ [

     

       23
       23
       +
           ] ++ lib.optionals stdenv.isx86_64 /* && isDarwin */ [

     

       24
       24
        
             CoreGraphics CoreVideo

     

       25
       25
        
           ]);

     

       26
       26
        
       

     
···

       36
       36
        
           "implicit-function-declaration"

     

       37
       37
        
           "gnu-variable-sized-type-not-at-end"

     

       38
       38
        
           "unused-result"

     

       39
       39
       -
         ] ++ lib.optional stdenv.isDarwin [ "-fcommon" ];

     

       39
       39
       +
         ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ];

     

       40
       40
        
       

     

       41
       41
        
         patchPhase = ''

     

       42
       42
        
           substituteInPlace ./Makefile \

+2 -2

pkgs/development/interpreters/php/generic.nix

···

       206
       206
        
                   [ pcre2 ]

     

       207
       207
        
       

     

       208
       208
        
                   # Enable sapis

     

       209
       209
       -
                   ++ lib.optional pearSupport [ libxml2.dev ]

     

       209
       209
       +
                   ++ lib.optionals pearSupport [ libxml2.dev ]

     

       210
       210
        
       

     

       211
       211
        
                   # Misc deps

     

       212
       212
        
                   ++ lib.optional apxs2Support apacheHttpd

     
···

       230
       230
        
                   ++ lib.optional (!cgiSupport) "--disable-cgi"

     

       231
       231
        
                   ++ lib.optional (!cliSupport) "--disable-cli"

     

       232
       232
        
                   ++ lib.optional fpmSupport "--enable-fpm"

     

       233
       233
       -
                   ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ]

     

       233
       233
       +
                   ++ lib.optionals pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ]

     

       234
       234
        
                   ++ lib.optional pharSupport "--enable-phar"

     

       235
       235
        
                   ++ lib.optional (!phpdbgSupport) "--disable-phpdbg"

     

       236
       236

+1 -1

pkgs/development/interpreters/python-cosmopolitan/default.nix

···

       9
       9
        
         nativeBuildInputs = [ bintools-unwrapped unzip ];

     

       10
       10
        
       

     

       11
       11
        
         # slashes are significant because upstream uses o/$(MODE)/foo.o

     

       12
       12
       -
         buildFlags = "o//third_party/python";

     

       12
       12
       +
         buildFlags = [ "o//third_party/python" ];

     

       13
       13
        
         checkTarget = "o//third_party/python/test";

     

       14
       14
        
         enableParallelBuilding = true;

     

       15
       15

+1 -1

pkgs/development/interpreters/python/cpython/2.7/default.nix

···

       166
       166
        
             # only works for GCC and Apple Clang. This makes distutils to call C++

     

       167
       167
        
             # compiler when needed.

     

       168
       168
        
             ./python-2.7-distutils-C++.patch

     

       169
       169
       -
           ] ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       169
       169
       +
           ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       170
       170
        
             ./cross-compile.patch

     

       171
       171
        
           ];

     

       172
       172

+1 -1

pkgs/development/interpreters/python/rustpython/default.nix

···

       20
       20
        
         cargoHash = "sha256-T85kiPG80oZ4mwpb8Ag40wDHKx2Aens+gM7NGXan5lM=";

     

       21
       21
        
       

     

       22
       22
        
         # freeze the stdlib into the rustpython binary

     

       23
       23
       -
         cargoBuildFlags = "--features=freeze-stdlib";

     

       23
       23
       +
         cargoBuildFlags = [ "--features=freeze-stdlib" ];

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ];

     

       26
       26

+2 -2

pkgs/development/interpreters/racket/default.nix

···

       128
       128
        
       

     

       129
       129
        
         shared = if stdenv.isDarwin then "dylib" else "shared";

     

       130
       130
        
         configureFlags = [ "--enable-${shared}"  "--enable-lt=${libtool}/bin/libtool" ]

     

       131
       131
       -
                          ++ lib.optional disableDocs [ "--disable-docs" ]

     

       132
       132
       -
                          ++ lib.optional stdenv.isDarwin [ "--enable-xonx" ];

     

       131
       131
       +
                          ++ lib.optionals disableDocs [ "--disable-docs" ]

     

       132
       132
       +
                          ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ];

     

       133
       133
        
       

     

       134
       134
        
         configureScript = "../configure";

     

       135
       135

+2 -2

pkgs/development/interpreters/racket/racket_7_9.nix

···

       83
       83
        
       

     

       84
       84
        
         shared = if stdenv.isDarwin then "dylib" else "shared";

     

       85
       85
        
         configureFlags = [ "--enable-${shared}"  "--enable-lt=${libtool}/bin/libtool" ]

     

       86
       86
       -
                          ++ lib.optional disableDocs [ "--disable-docs" ]

     

       87
       87
       -
                          ++ lib.optional stdenv.isDarwin [ "--enable-xonx" ];

     

       86
       86
       +
                          ++ lib.optionals disableDocs [ "--disable-docs" ]

     

       87
       87
       +
                          ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ];

     

       88
       88
        
       

     

       89
       89
        
         configureScript = "../configure";

     

       90
       90

+1 -1

pkgs/development/interpreters/spidermonkey/common.nix

···

       42
       42
        
           inherit hash;

     

       43
       43
        
         };

     

       44
       44
        
       

     

       45
       45
       -
         patches = lib.optional (lib.versionOlder version "91") [

     

       45
       45
       +
         patches = lib.optionals (lib.versionOlder version "91") [

     

       46
       46
        
           # Fix build failure on armv7l using Debian patch

     

       47
       47
        
           # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653

     

       48
       48
        
           (fetchpatch {

+1 -1

pkgs/development/libraries/ada/gnatcoll/db.nix

···

       95
       95
        
           # confusingly, for gprbuild --target is autoconf --host

     

       96
       96
        
           "TARGET=${stdenv.hostPlatform.config}"

     

       97
       97
        
           "prefix=${placeholder "out"}"

     

       98
       98
       -
         ] ++ lib.optional (component == "sqlite") [

     

       98
       98
       +
         ] ++ lib.optionals (component == "sqlite") [

     

       99
       99
        
           # link against packaged, not vendored libsqlite3

     

       100
       100
        
           "GNATCOLL_SQLITE=external"

     

       101
       101
        
         ];

+1 -1

pkgs/development/libraries/apr/default.nix

···

       49
       49
        
             configureFlagsArray+=("--with-installbuilddir=$dev/share/build")

     

       50
       50
        
           '';

     

       51
       51
        
       

     

       52
       52
       -
         configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       52
       52
       +
         configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       53
       53
        
           # For cross builds, provide answers to the configure time tests.

     

       54
       54
        
           # These answers are valid on x86_64-linux and aarch64-linux.

     

       55
       55
        
           "ac_cv_file__dev_zero=yes"

+1 -1

pkgs/development/libraries/cosmopolitan/default.nix

···

       21
       21
        
         outputs = [ "out" "dist" ];

     

       22
       22
        
       

     

       23
       23
        
         # slashes are significant because upstream uses o/$(MODE)/foo.o

     

       24
       24
       -
         buildFlags = "o/cosmopolitan.h o//cosmopolitan.a o//libc/crt/crt.o o//ape/ape.o o//ape/ape.lds";

     

       24
       24
       +
         buildFlags = [ "o/cosmopolitan.h" "o//cosmopolitan.a" "o//libc/crt/crt.o" "o//ape/ape.o" "o//ape/ape.lds" ];

     

       25
       25
        
         checkTarget = "o//test";

     

       26
       26
        
         enableParallelBuilding = true;

     

       27
       27

+2 -2

pkgs/development/libraries/cxxopts/default.nix

···

       21
       21
        
         # CMake does not set CMAKE_LIBRARY_ARCHITECTURE variable in Nix, which breaks architecture-independent library path generation

     

       22
       22
        
         patches = [ ./fix-install-path.patch ];

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = lib.optional enableUnicodeHelp [ icu.dev ];

     

       24
       24
       +
         buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ];

     

       25
       25
        
         cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ]

     

       26
       26
        
           ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE";

     

       27
       27
       -
         nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ];

     

       27
       27
       +
         nativeBuildInputs = [ cmake ] ++ lib.optionals enableUnicodeHelp [ pkg-config ];

     

       28
       28
        
       

     

       29
       29
        
         doCheck = true;

     

       30
       30

+1 -1

pkgs/development/libraries/cyrus-sasl/default.nix

···

       39
       39
        
           "--enable-shared"

     

       40
       40
        
         ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}";

     

       41
       41
        
       

     

       42
       42
       -
         installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];

     

       42
       42
       +
         installFlags = lib.optionals stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];

     

       43
       43
        
       

     

       44
       44
        
         passthru.tests = {

     

       45
       45
        
           inherit (nixosTests) parsedmarc postfix;

+1 -1

pkgs/development/libraries/drogon/default.nix

···

       37
       37
        
           ++ lib.optional postgresSupport postgresql

     

       38
       38
        
           ++ lib.optional redisSupport hiredis

     

       39
       39
        
           # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies)

     

       40
       40
       -
           ++ lib.optional mysqlSupport [ libmysqlclient mariadb ];

     

       40
       40
       +
           ++ lib.optionals mysqlSupport [ libmysqlclient mariadb ];

     

       41
       41
        
       

     

       42
       42
        
         patches = [

     

       43
       43
        
           # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself

+2 -2

pkgs/development/libraries/galario/default.nix

···

       34
       34
        
         ++ lib.optional stdenv.isDarwin llvmPackages.openmp

     

       35
       35
        
         ;

     

       36
       36
        
       

     

       37
       37
       -
         propagatedBuildInputs = lib.optional enablePython [

     

       37
       37
       +
         propagatedBuildInputs = lib.optionals enablePython [

     

       38
       38
        
           pythonPackages.numpy

     

       39
       39
        
           pythonPackages.cython

     

       40
       40
        
           pythonPackages.pytest

     

       41
       41
        
         ];

     

       42
       42
        
       

     

       43
       43
       -
         checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ];

     

       43
       43
       +
         checkInputs = lib.optionals enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ];

     

       44
       44
        
       

     

       45
       45
        
         preConfigure = ''

     

       46
       46
        
           mkdir -p build/external/src

+1 -1

pkgs/development/libraries/gnutls/default.nix

···

       65
       65
        
           "--with-unbound-root-key-file=${dns-root-data}/root.key"

     

       66
       66
        
           (lib.withFeature withP11-kit "p11-kit")

     

       67
       67
        
           (lib.enableFeature cxxBindings "cxx")

     

       68
       68
       -
         ] ++ lib.optional guileBindings [

     

       68
       68
       +
         ] ++ lib.optionals guileBindings [

     

       69
       69
        
           "--enable-guile"

     

       70
       70
        
           "--with-guile-site-dir=\${out}/share/guile/site"

     

       71
       71
        
           "--with-guile-site-ccache-dir=\${out}/share/guile/site"

+1 -1

pkgs/development/libraries/gstreamer/base/default.nix

···

       79
       79
        
           libjpeg

     

       80
       80
        
           tremor

     

       81
       81
        
           libGL

     

       82
       82
       -
         ] ++ lib.optional (!stdenv.isDarwin) [

     

       82
       82
       +
         ] ++ lib.optionals (!stdenv.isDarwin) [

     

       83
       83
        
           libvisual

     

       84
       84
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       85
       85
        
           pango

+1 -1

pkgs/development/libraries/hunspell/default.nix

···

       24
       24
        
           patchShebangs tests

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       -
         autoreconfFlags = "-vfi";

     

       27
       27
       +
         autoreconfFlags = [ "-vfi" ];

     

       28
       28
        
       

     

       29
       29
        
         configureFlags = [ "--with-ui" "--with-readline" ];

     

       30
       30

+1 -1

pkgs/development/libraries/json-glib/default.nix

···

       45
       45
        
           libxslt

     

       46
       46
        
           gobject-introspection

     

       47
       47
        
           gi-docgen

     

       48
       48
       -
         ] ++ lib.optional stdenv.hostPlatform.isDarwin [

     

       48
       48
       +
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       49
       49
        
           fixDarwinDylibNames

     

       50
       50
        
         ];

     

       51
       51

+1 -1

pkgs/development/libraries/kerberos/krb5.nix

···

       31
       31
        
         configureFlags = [ "--localstatedir=/var/lib" ]

     

       32
       32
        
           # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time.

     

       33
       33
        
           # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737

     

       34
       34
       -
           ++ lib.optional staticOnly [ "--enable-static" "--disable-shared" ]

     

       34
       34
       +
           ++ lib.optionals staticOnly [ "--enable-static" "--disable-shared" ]

     

       35
       35
        
           ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS=""''

     

       36
       36
        
           ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)

     

       37
       37
        
              [ "krb5_cv_attr_constructor_destructor=yes,yes"

+2 -2

pkgs/development/libraries/libav/default.nix

···

       17
       17
        
       

     

       18
       18
        
       assert faacSupport -> enableUnfree;

     

       19
       19
        
       

     

       20
       20
       -
       let inherit (lib) optional hasPrefix enableFeature; in

     

       20
       20
       +
       let inherit (lib) optional optionals hasPrefix enableFeature; in

     

       21
       21
        
       

     

       22
       22
        
       /* ToDo:

     

       23
       23
        
           - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools

     
···

       77
       77
        
             (enableFeature vaapiSupport "vaapi")

     

       78
       78
        
             (enableFeature vdpauSupport "vdpau")

     

       79
       79
        
             (enableFeature freetypeSupport "libfreetype")

     

       80
       80
       -
           ] ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       80
       80
       +
           ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       81
       81
        
             "--cross-prefix=${stdenv.cc.targetPrefix}"

     

       82
       82
        
             "--enable-cross-compile"

     

       83
       83
        
           ];

+1 -1

pkgs/development/libraries/libdaemon/default.nix

···

       12
       12
        
         patches = [ ./fix-includes.patch ];

     

       13
       13
        
       

     

       14
       14
        
         configureFlags = [ "--disable-lynx" ]

     

       15
       15
       -
           ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

     

       15
       15
       +
           ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)

     

       16
       16
        
           [ # Can't run this test while cross-compiling

     

       17
       17
        
             "ac_cv_func_setpgrp_void=yes"

     

       18
       18
        
           ];

+1 -1

pkgs/development/libraries/libdeflate/default.nix

···

       22
       22
        
           substituteInPlace Makefile --replace /usr/local $out

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
       -
         makeFlags = lib.optional stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=1"];

     

       25
       25
       +
         makeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=1"];

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

     

       28
       28

+1 -1

pkgs/development/libraries/libeatmydata/default.nix

···

       13
       13
        
       

     

       14
       14
        
         patches = [ ./find-shell-lib.patch ];

     

       15
       15
        
       

     

       16
       16
       -
         patchFlags = "-p0";

     

       16
       16
       +
         patchFlags = [ "-p0" ];

     

       17
       17
        
       

     

       18
       18
        
         postPatch = ''

     

       19
       19
        
           substituteInPlace eatmydata.in \

+1 -1

pkgs/development/libraries/libff/default.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         cmakeFlags = [ "-DWITH_PROCPS=Off" ]

     

       16
       16
       -
           ++ lib.optional stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ];

     

       16
       16
       +
           ++ lib.optionals stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ];

     

       17
       17
        
       

     

       18
       18
        
         # CMake is hardcoded to always build static library which causes linker

     

       19
       19
        
         # failure for Haskell applications depending on haskellPackages.hevm on macOS.

+1 -1

pkgs/development/libraries/libmcrypt/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = optional stdenv.isDarwin darwin.cctools;

     

       15
       15
        
       

     

       16
       16
       -
         configureFlags = optional disablePosixThreads

     

       16
       16
       +
         configureFlags = optionals disablePosixThreads

     

       17
       17
        
           [ "--disable-posix-threads" ];

     

       18
       18
        
       

     

       19
       19
        
         meta = {

+1 -1

pkgs/development/libraries/libpam-wrapper/default.nix

···

       18
       18
        
           sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ cmake ] ++ lib.optional enablePython [ python ];

     

       21
       21
       +
         nativeBuildInputs = [ cmake ] ++ lib.optionals enablePython [ python ];

     

       22
       22
        
       

     

       23
       23
        
         # We must use linux-pam, using openpam will result in broken fprintd.

     

       24
       24
        
         buildInputs = [ linux-pam ];

+1 -1

pkgs/development/libraries/libvdpau/default.nix

···

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ xorg.libX11 ];

     

       19
       19
        
       

     

       20
       20
       -
         mesonFlags = lib.optional stdenv.isLinux

     

       20
       20
       +
         mesonFlags = lib.optionals stdenv.isLinux

     

       21
       21
        
           [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ];

     

       22
       22
        
       

     

       23
       23
        
         NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lX11";

+1 -1

pkgs/development/libraries/libvncserver/default.nix

···

       36
       36
        
           libpng

     

       37
       37
        
         ] ++ lib.optionals stdenv.isLinux [

     

       38
       38
        
           systemd

     

       39
       39
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       39
       39
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       40
       40
        
           Carbon

     

       41
       41
        
         ];

     

       42
       42

+1 -1

pkgs/development/libraries/libxslt/default.nix

···

       36
       36
        
       

     

       37
       37
        
         buildInputs = [

     

       38
       38
        
           libxml2.dev libxcrypt

     

       39
       39
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       39
       39
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       40
       40
        
           gettext

     

       41
       41
        
         ] ++ lib.optionals pythonSupport [

     

       42
       42
        
           libxml2.py

+1 -1

pkgs/development/libraries/mimalloc/default.nix

···

       24
       24
        
         '';

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [ cmake ninja ];

     

       27
       27
       -
         cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ];

     

       27
       27
       +
         cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ];

     

       28
       28
        
       

     

       29
       29
        
         postInstall = let

     

       30
       30
        
           rel = lib.versions.majorMinor version;

+1 -1

pkgs/development/libraries/nng/default.nix

···

       14
       14
        
         nativeBuildInputs = [ cmake ninja ]

     

       15
       15
        
           ++ lib.optionals mbedtlsSupport [ mbedtls ];

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = lib.optional mbedtlsSupport [ mbedtls ];

     

       17
       17
       +
         buildInputs = lib.optionals mbedtlsSupport [ mbedtls ];

     

       18
       18
        
       

     

       19
       19
        
         cmakeFlags = [ "-G Ninja" "-DNNG_ENABLE_TLS=ON" ]

     

       20
       20
        
           ++ lib.optionals mbedtlsSupport [ "-DMBEDTLS_ROOT_DIR=${mbedtls}" ];

+1 -1

pkgs/development/libraries/openbsm/default.nix

···

       11
       11
        
           sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ];

     

       14
       14
       +
         patches = lib.optionals stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ];

     

       15
       15
        
       

     

       16
       16
        
         preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''

     

       17
       17
        
           MACOSX_DEPLOYMENT_TARGET=10.16

+1 -1

pkgs/development/libraries/opencv/3.x.nix

···

       248
       248
        
           "-DBUILD_opencv_videoio=OFF"

     

       249
       249
        
         ] ++ lib.optionals enablePython [

     

       250
       250
        
           "-DOPENCV_SKIP_PYTHON_LOADER=ON"

     

       251
       251
       -
         ] ++ lib.optional enableEigen [

     

       251
       251
       +
         ] ++ lib.optionals enableEigen [

     

       252
       252
        
           # Autodetection broken by https://github.com/opencv/opencv/pull/13337

     

       253
       253
        
           "-DEIGEN_INCLUDE_PATH=${eigen}/include/eigen3"

     

       254
       254
        
         ];

+1 -1

pkgs/development/libraries/openmpi/default.nix

···

       50
       50
        
           ++ lib.optionals cudaSupport [ cudatoolkit ]

     

       51
       51
        
           ++ [ libevent hwloc ]

     

       52
       52
        
           ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core

     

       53
       53
       -
           ++ lib.optional fabricSupport [ libpsm2 libfabric ];

     

       53
       53
       +
           ++ lib.optionals fabricSupport [ libpsm2 libfabric ];

     

       54
       54
        
       

     

       55
       55
        
         nativeBuildInputs = [ perl ]

     

       56
       56
        
           ++ lib.optionals fortranSupport [ gfortran ];

+2 -2

pkgs/development/libraries/openvino/default.nix

···

       68
       68
        
           "-DNGRAPH_UNIT_TEST_ENABLE:BOOL=OFF"

     

       69
       69
        
           "-DENABLE_SAMPLES:BOOL=OFF"

     

       70
       70
        
           "-DENABLE_CPPLINT:BOOL=OFF"

     

       71
       71
       -
         ] ++ lib.optional enablePython [

     

       71
       71
       +
         ] ++ lib.optionals enablePython [

     

       72
       72
        
           "-DENABLE_PYTHON:BOOL=ON"

     

       73
       73
        
         ];

     

       74
       74
        
       

     
···

       106
       106
        
           python

     

       107
       107
        
           tbb

     

       108
       108
        
           shellcheck

     

       109
       109
       -
         ] ++ lib.optional enablePython (with python.pkgs; [

     

       109
       109
       +
         ] ++ lib.optionals enablePython (with python.pkgs; [

     

       110
       110
        
           cython

     

       111
       111
        
           pybind11

     

       112
       112
        
         ]);

+1 -1

pkgs/development/libraries/pangomm/2.48.nix

···

       28
       28
        
           meson

     

       29
       29
        
           ninja

     

       30
       30
        
           python3

     

       31
       31
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       31
       31
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       32
       32
        
           ApplicationServices

     

       33
       33
        
         ];

     

       34
       34

+1 -1

pkgs/development/libraries/poppler/default.nix

···

       77
       77
        
           pcre

     

       78
       78
        
           libiconv

     

       79
       79
        
           libintl

     

       80
       80
       -
         ] ++ lib.optional withData [

     

       80
       80
       +
         ] ++ lib.optionals withData [

     

       81
       81
        
           poppler_data

     

       82
       82
        
         ];

     

       83
       83

+1 -1

pkgs/development/libraries/precice/default.nix

···

       18
       18
        
           "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       -
         NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ];

     

       21
       21
       +
         NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ];

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ cmake gcc ];

     

       24
       24
        
         buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ];

+1 -1

pkgs/development/libraries/qt-5/modules/qtlocation.nix

···

       4
       4
        
         pname = "qtlocation";

     

       5
       5
        
         qtInputs = [ qtbase qtmultimedia ];

     

       6
       6
        
         outputs = [ "bin" "out" "dev" ];

     

       7
       7
       -
         qmakeFlags = lib.optional stdenv.isDarwin [

     

       7
       7
       +
         qmakeFlags = lib.optionals stdenv.isDarwin [

     

       8
       8
        
            # boost uses std::auto_ptr which has been disabled in clang with libcxx

     

       9
       9
        
            # This flag re-enables this feature

     

       10
       10
        
            # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros

+2 -2

pkgs/development/libraries/redis-plus-plus/default.nix

···

       22
       22
        
       

     

       23
       23
        
         cmakeFlags = [

     

       24
       24
        
           "-DREDIS_PLUS_PLUS_BUILD_TEST=OFF"

     

       25
       25
       -
         ] ++ lib.optional (!enableShared) [

     

       25
       25
       +
         ] ++ lib.optionals (!enableShared) [

     

       26
       26
        
           "-DREDIS_PLUS_PLUS_BUILD_SHARED=OFF"

     

       27
       27
       -
         ] ++ lib.optional (!enableStatic) [

     

       27
       27
       +
         ] ++ lib.optionals (!enableStatic) [

     

       28
       28
        
           "-DREDIS_PLUS_PLUS_BUILD_STATIC=OFF"

     

       29
       29
        
         ];

     

       30
       30

+1 -1

pkgs/development/libraries/rustc-demangle/default.nix

···

       16
       16
        
           ./add-Cargo.lock.patch

     

       17
       17
        
         ];

     

       18
       18
        
         cargoSha256 = "sha256-1tW5TOap5MstxTXAFij3IB8TIpI+FryEX9TXlVXjRl4=";

     

       19
       19
       -
         cargoBuildFlags = "-p rustc-demangle-capi";

     

       19
       19
       +
         cargoBuildFlags = [ "-p" "rustc-demangle-capi" ];

     

       20
       20
        
         postInstall = ''

     

       21
       21
        
           mkdir -p $out/lib

     

       22
       22
        
           cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib

+1 -1

pkgs/development/libraries/science/math/faiss/default.nix

···

       56
       56
        
         nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [

     

       57
       57
        
           cudatoolkit

     

       58
       58
        
           addOpenGLRunpath

     

       59
       59
       -
         ] ++ lib.optional pythonSupport [

     

       59
       59
       +
         ] ++ lib.optionals pythonSupport [

     

       60
       60
        
           pythonPackages.python

     

       61
       61
        
         ];

     

       62
       62

+2 -2

pkgs/development/libraries/science/networking/ns-3/default.nix

···

       53
       53
        
       

     

       54
       54
        
         # ncurses is a hidden dependency of waf when checking python

     

       55
       55
        
         buildInputs = lib.optionals pythonSupport [ castxml ncurses ]

     

       56
       56
       -
           ++ lib.optional enableDoxygen [ doxygen graphviz imagemagick ]

     

       57
       57
       -
           ++ lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];

     

       56
       56
       +
           ++ lib.optionals enableDoxygen [ doxygen graphviz imagemagick ]

     

       57
       57
       +
           ++ lib.optionals withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];

     

       58
       58
        
       

     

       59
       59
        
         propagatedBuildInputs = [ pythonEnv ];

     

       60
       60

+8 -8

pkgs/development/libraries/speechd/default.nix

···

       69
       69
        
           espeak

     

       70
       70
        
           sonic

     

       71
       71
        
           pcaudiolib

     

       72
       72
       -
         ] ++ lib.optional withFlite [

     

       72
       72
       +
         ] ++ lib.optionals withFlite [

     

       73
       73
        
           flite

     

       74
       74
       -
         ] ++ lib.optional withPico [

     

       74
       74
       +
         ] ++ lib.optionals withPico [

     

       75
       75
        
           svox

     

       76
       76
        
         ];

     

       77
       77
        
       

     
···

       83
       83
        
           # Audio method falls back from left to right.

     

       84
       84
        
           "--with-default-audio-method=\"libao,pulse,alsa,oss\""

     

       85
       85
        
           "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"

     

       86
       86
       -
         ] ++ lib.optional withPulse [

     

       86
       86
       +
         ] ++ lib.optionals withPulse [

     

       87
       87
        
         "--with-pulse"

     

       88
       88
       -
         ] ++ lib.optional withAlsa [

     

       88
       88
       +
         ] ++ lib.optionals withAlsa [

     

       89
       89
        
           "--with-alsa"

     

       90
       90
       -
         ] ++ lib.optional withLibao [

     

       90
       90
       +
         ] ++ lib.optionals withLibao [

     

       91
       91
        
           "--with-libao"

     

       92
       92
       -
         ] ++ lib.optional withOss [

     

       92
       92
       +
         ] ++ lib.optionals withOss [

     

       93
       93
        
           "--with-oss"

     

       94
       94
       -
         ] ++ lib.optional withEspeak [

     

       94
       94
       +
         ] ++ lib.optionals withEspeak [

     

       95
       95
        
           "--with-espeak-ng"

     

       96
       96
       -
         ] ++ lib.optional withPico [

     

       96
       96
       +
         ] ++ lib.optionals withPico [

     

       97
       97
        
           "--with-pico"

     

       98
       98
        
         ];

     

       99
       99

+1 -1

pkgs/development/libraries/vtk/generic.nix

···

       48
       48
        
             ImageIO

     

       49
       49
        
             OpenGL

     

       50
       50
        
             GLUT

     

       51
       51
       -
           ] ++ optional enablePython [

     

       51
       51
       +
           ] ++ optionals enablePython [

     

       52
       52
        
             pythonInterpreter

     

       53
       53
        
           ];

     

       54
       54
        
         propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ];

+1 -1

pkgs/development/mobile/androidenv/cmake.nix

···

       3
       3
        
       deployAndroidPackage {

     

       4
       4
        
         inherit package os;

     

       5
       5
        
         nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       6
       6
       -
         buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];

     

       6
       6
       +
         buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];

     

       7
       7
        
         patchInstructions = lib.optionalString (os == "linux") ''

     

       8
       8
        
           autoPatchelf $packageBaseDir/bin

     

       9
       9
        
         '';

+1 -1

pkgs/development/mobile/androidenv/ndk-bundle/default.nix

···

       12
       12
        
         nativeBuildInputs = [ makeWrapper ]

     

       13
       13
        
           ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];

     

       14
       14
        
         autoPatchelfIgnoreMissingDeps = true;

     

       15
       15
       -
         buildInputs = lib.optional (os == "linux") [ pkgs.zlib ];

     

       15
       15
       +
         buildInputs = lib.optionals (os == "linux") [ pkgs.zlib ];

     

       16
       16
        
         patchInstructions = lib.optionalString (os == "linux") (''

     

       17
       17
        
           patchShebangs .

     

       18
       18

+1 -1

pkgs/development/mobile/androidenv/tools/25.nix

···

       3
       3
        
       deployAndroidPackage {

     

       4
       4
        
         name = "androidsdk";

     

       5
       5
        
         nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

     

       6
       6
       -
         buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];

     

       6
       6
       +
         buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ];

     

       7
       7
        
         inherit package os;

     

       8
       8
        
       

     

       9
       9
        
         patchInstructions = ''

+1 -1

pkgs/development/node-packages/overrides.nix

···

       423
       423
        
       

     

       424
       424
        
         pulp = prev.pulp.override {

     

       425
       425
        
           # tries to install purescript

     

       426
       426
       -
           npmFlags = "--ignore-scripts";

     

       426
       426
       +
           npmFlags = builtins.toString [ "--ignore-scripts" ];

     

       427
       427
        
       

     

       428
       428
        
           nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];

     

       429
       429
        
           postInstall =  ''

+1 -1

pkgs/development/ocaml-modules/bz2/default.nix

···

       15
       15
        
           sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         autoreconfFlags = "-I .";

     

       18
       18
       +
         autoreconfFlags = [ "-I" "." ];

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     

       21
       21
        
           autoreconfHook

+1 -1

pkgs/development/ocaml-modules/cudf/default.nix

···

       38
       38
        
         doCheck = true;

     

       39
       39
        
       

     

       40
       40
        
         preInstall = "mkdir -p $OCAMLFIND_DESTDIR";

     

       41
       41
       -
         installFlags = "BINDIR=$(out)/bin";

     

       41
       41
       +
         installFlags = [ "BINDIR=$(out)/bin" ];

     

       42
       42
        
       

     

       43
       43
        
         meta = with lib; {

     

       44
       44
        
           description = "A library for CUDF format";

+1 -1

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

···

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

     

       22
       22
        
           pycares

     

       23
       23
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       23
       23
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       24
       24
        
           typing

     

       25
       25
        
         ];

     

       26
       26

+1 -1

pkgs/development/python-modules/ansible-runner/default.nix

···

       65
       65
        
           "test_large_stdout_blob"

     

       66
       66
        
           # Failed: DID NOT RAISE <class 'RuntimeError'>

     

       67
       67
        
           "test_validate_pattern"

     

       68
       68
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       68
       68
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       69
       69
        
           # test_process_isolation_settings is currently broken on Darwin Catalina

     

       70
       70
        
           # https://github.com/ansible/ansible-runner/issues/413

     

       71
       71
        
           "process_isolation_settings"

+1 -1

pkgs/development/python-modules/aspy-refactor-imports/default.nix

···

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         # fails on darwin due to case-insensitive file system

     

       30
       30
       -
         disabledTests = lib.optional stdenv.isDarwin ["test_application_directory_case"];

     

       30
       30
       +
         disabledTests = lib.optionals stdenv.isDarwin ["test_application_directory_case"];

     

       31
       31
        
       

     

       32
       32
        
         meta = with lib; {

     

       33
       33
        
           description = "Utilities for refactoring imports in python-like syntax.";

+1 -1

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

···

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

     

       21
       21
        
           paho-mqtt

     

       22
       22
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       22
       22
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       23
       23
        
           async_generator

     

       24
       24
        
         ];

     

       25
       25

+1 -1

pkgs/development/python-modules/azure-core/default.nix

···

       63
       63
        
         # disable 8 tests failing on some darwin machines with errors:

     

       64
       64
        
         # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation

     

       65
       65
        
         # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden'

     

       66
       66
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       66
       66
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       67
       67
        
           "location_polling_fail"

     

       68
       68
        
         ];

     

       69
       69
        
         disabledTestPaths = [

+1 -1

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

···

       35
       35
        
         propagatedBuildInputs = [

     

       36
       36
        
           grpclib

     

       37
       37
        
           python-dateutil

     

       38
       38
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       38
       38
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       39
       39
        
           dataclasses

     

       40
       40
        
         ];

     

       41
       41

+1 -1

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

···

       19
       19
        
         nativeBuildInputs = [ clang_12 python2 ];

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ]

     

       22
       22
       -
           ++ lib.optional withCuda [ cudatoolkit ];

     

       22
       22
       +
           ++ lib.optionals withCuda [ cudatoolkit ];

     

       23
       23
        
       

     

       24
       24
        
         patches = [

     

       25
       25
        
           ./nix-support.patch

+1 -1

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

···

       19
       19
        
       

     

       20
       20
        
         checkInputs = [

     

       21
       21
        
           pytz

     

       22
       22
       -
         ] ++ lib.optional (isPy27) [

     

       22
       22
       +
         ] ++ lib.optionals (isPy27) [

     

       23
       23
        
           unittest2

     

       24
       24
        
         ];

     

       25
       25

+1 -1

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

···

       30
       30
        
       

     

       31
       31
        
         # avoiding mass rebuilds for python3.9, but no longer

     

       32
       32
        
         # needed with patch

     

       33
       33
       -
         checkInputs = [ unittestCheckHook ] ++ lib.optional (pythonOlder "3.10") [

     

       33
       33
       +
         checkInputs = [ unittestCheckHook ] ++ lib.optionals (pythonOlder "3.10") [

     

       34
       34
        
           unittest2

     

       35
       35
        
         ];

     

       36
       36

+1 -1

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

···

       21
       21
        
       

     

       22
       22
        
         checkInputs = [

     

       23
       23
        
           pytestCheckHook

     

       24
       24
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       24
       24
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       25
       25
        
           cacert

     

       26
       26
        
         ];

     

       27
       27

+1 -1

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

···

       36
       36
        
         disabledTests = [

     

       37
       37
        
           # AssertionError: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='utf-8'> is not...

     

       38
       38
        
           "test_init"

     

       39
       39
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       39
       39
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       40
       40
        
           # https://github.com/Rockhopper-Technologies/enlighten/issues/44

     

       41
       41
        
           "test_autorefresh"

     

       42
       42
        
         ];

+1 -1

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

···

       19
       19
        
           sha256 = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         patches = lib.optional (pythonAtLeast "3.9") [

     

       22
       22
       +
         patches = lib.optionals (pythonAtLeast "3.9") [

     

       23
       23
        
           # drop tests that try to monkeypatch a classmethod, which fails on python3.9

     

       24
       24
        
           # https://github.com/testing-cabal/fixtures/issues/44

     

       25
       25
        
           (fetchpatch {

+1 -1

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

···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # https://github.com/testing-cabal/funcsigs/issues/10

     

       15
       15
       -
         patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ];

     

       15
       15
       +
         patches = lib.optionals (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ];

     

       16
       16
        
       

     

       17
       17
        
         # requires, unittest2 and package hasn't been maintained since 2013

     

       18
       18
        
         doCheck = false;

+1 -1

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

···

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

     

       28
       28
        
           numpy

     

       29
       29
       -
         ] ++ lib.optional isPy27 [ contextlib2 mock importlib-resources ];

     

       29
       29
       +
         ] ++ lib.optionals isPy27 [ contextlib2 mock importlib-resources ];

     

       30
       30
        
       

     

       31
       31
        
         checkInputs = [

     

       32
       32
        
           scikitimage

+1 -1

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

···

       19
       19
        
         # segfaults in the testsuite that end up failing the tests in a background thread (in myapp)

     

       20
       20
        
         checkInputs = [

     

       21
       21
        
           pytestCheckHook

     

       22
       22
       -
         ] ++ lib.optional (!stdenv.isDarwin) [

     

       22
       22
       +
         ] ++ lib.optionals (!stdenv.isDarwin) [

     

       23
       23
        
           watchdog

     

       24
       24
        
         ];

     

       25
       25

+1 -1

pkgs/development/python-modules/importlib-resources/default.nix

···

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [

     

       29
       29
        
           importlib-metadata

     

       30
       30
       -
         ] ++ lib.optional (pythonOlder "3.5") [

     

       30
       30
       +
         ] ++ lib.optionals (pythonOlder "3.5") [

     

       31
       31
        
           typing

     

       32
       32
        
         ];

     

       33
       33

+2 -2

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

···

       37
       37
        
           jaraco-context

     

       38
       38
        
           jaraco_functools

     

       39
       39
        
           inflect

     

       40
       40
       -
         ] ++ lib.optional (pythonOlder "3.9") [

     

       40
       40
       +
         ] ++ lib.optionals (pythonOlder "3.9") [

     

       41
       41
        
           importlib-resources

     

       42
       42
        
         ];

     

       43
       43
        
       

     

       44
       44
        
         checkInputs = [

     

       45
       45
        
           pytestCheckHook

     

       46
       46
       -
         ] ++ lib.optional (pythonOlder "3.10") [

     

       46
       46
       +
         ] ++ lib.optionals (pythonOlder "3.10") [

     

       47
       47
        
           pathlib2

     

       48
       48
        
         ];

     

       49
       49

+3 -3

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

···

       219
       219
        
           # relevant dependencies can be downloaded.

     

       220
       220
        
           bazelFlags = [

     

       221
       221
        
             "-c opt"

     

       222
       222
       -
           ] ++ lib.optional (stdenv.targetPlatform.isx86_64 && stdenv.targetPlatform.isUnix) [

     

       222
       222
       +
           ] ++ lib.optionals (stdenv.targetPlatform.isx86_64 && stdenv.targetPlatform.isUnix) [

     

       223
       223
        
             "--config=avx_posix"

     

       224
       224
       -
           ] ++ lib.optional cudaSupport [

     

       224
       224
       +
           ] ++ lib.optionals cudaSupport [

     

       225
       225
        
             "--config=cuda"

     

       226
       226
       -
           ] ++ lib.optional mklSupport [

     

       226
       226
       +
           ] ++ lib.optionals mklSupport [

     

       227
       227
        
             "--config=mkl_open_source_only"

     

       228
       228
        
           ] ++ lib.optionals stdenv.cc.isClang [

     

       229
       229
        
             # bazel depends on the compiler frontend automatically selecting these flags based on file

+1 -1

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

···

       23
       23
        
       

     

       24
       24
        
         dontUseCmakeConfigure = true;

     

       25
       25
        
       

     

       26
       26
       -
         buildInputs = lib.optional stdenv.cc.isClang [ llvmPackages.openmp ];

     

       26
       26
       +
         buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];

     

       27
       27
        
         propagatedBuildInputs = [

     

       28
       28
        
           numpy

     

       29
       29
        
           scipy

+1 -1

pkgs/development/python-modules/markdown-it-py/default.nix

···

       35
       35
        
           attrs

     

       36
       36
        
           linkify-it-py

     

       37
       37
        
           mdurl

     

       38
       38
       -
         ] ++ lib.optional (pythonOlder "3.8") [

     

       38
       38
       +
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       39
       39
        
           typing-extensions

     

       40
       40
        
         ];

     

       41
       41

+2 -2

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

···

       39
       39
        
         buildInputs = [

     

       40
       40
        
           which

     

       41
       41
        
           sphinx

     

       42
       42
       -
         ] ++ lib.optional enableGhostscript [

     

       42
       42
       +
         ] ++ lib.optionals enableGhostscript [

     

       43
       43
        
           ghostscript

     

       44
       44
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       44
       44
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       45
       45
        
           Cocoa

     

       46
       46
        
         ];

     

       47
       47

+1 -1

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

···

       21
       21
        
           sha256 = "a8a2c97ce854fece4aced5a6394b9fdca5846150ad6d2a36b86590924af3c848";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = lib.optional doCheck [ nose ];

     

       24
       24
       +
         buildInputs = lib.optionals doCheck [ nose ];

     

       25
       25
        
         propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ];

     

       26
       26
        
       

     

       27
       27
        
         checkPhase = ''    # wants to be run in a different directory

+1 -1

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

···

       68
       68
        
           "sock_server"

     

       69
       69
        
           "test_list_formats" # tries to find python MIME type

     

       70
       70
        
           "KernelCullingTest" # has a race condition failing on slower hardware

     

       71
       71
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       71
       71
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       72
       72
        
           "test_delete"

     

       73
       73
        
           "test_checkpoints_follow_file"

     

       74
       74
        
         ];

+1 -1

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

···

       40
       40
        
       

     

       41
       41
        
         NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";

     

       42
       42
        
       

     

       43
       43
       -
         nativeBuildInputs = lib.optional cudaSupport [

     

       43
       43
       +
         nativeBuildInputs = lib.optionals cudaSupport [

     

       44
       44
        
           addOpenGLRunpath

     

       45
       45
        
         ];

     

       46
       46

+1 -1

pkgs/development/python-modules/paho-mqtt/default.nix

···

       22
       22
        
         checkInputs = [

     

       23
       23
        
           pytestCheckHook

     

       24
       24
        
           six

     

       25
       25
       -
         ] ++ lib.optional (!isPy3k) [

     

       25
       25
       +
         ] ++ lib.optionals (!isPy3k) [

     

       26
       26
        
           mock

     

       27
       27
        
         ];

     

       28
       28

+2 -2

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

···

       34
       34
        
       

     

       35
       35
        
         propagatedBuildInputs = [

     

       36
       36
        
           apsw

     

       37
       37
       -
         ] ++ lib.optional withPostgres [

     

       37
       37
       +
         ] ++ lib.optionals withPostgres [

     

       38
       38
        
           psycopg2

     

       39
       39
       -
         ] ++ lib.optional withMysql [

     

       39
       39
       +
         ] ++ lib.optionals withMysql [

     

       40
       40
        
           mysql-connector

     

       41
       41
        
         ];

     

       42
       42

+2 -2

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

···

       35
       35
        
         propagatedBuildInputs = [

     

       36
       36
        
           cached-property

     

       37
       37
        
           pycparser

     

       38
       38
       -
         ] ++ lib.optional (!isPyPy) [

     

       38
       38
       +
         ] ++ lib.optionals (!isPyPy) [

     

       39
       39
        
           cffi

     

       40
       40
        
         ];

     

       41
       41
        
       

     

       42
       42
       -
         propagatedNativeBuildInputs = lib.optional (!isPyPy) [

     

       42
       42
       +
         propagatedNativeBuildInputs = lib.optionals (!isPyPy) [

     

       43
       43
        
           cffi

     

       44
       44
        
         ];

     

       45
       45

+1 -1

pkgs/development/python-modules/pyls-mypy/default.nix

···

       38
       38
        
       

     

       39
       39
        
         propagatedBuildInputs = [

     

       40
       40
        
           mypy python-language-server configparser

     

       41
       41
       -
         ] ++ lib.optional (isPy27) [

     

       41
       41
       +
         ] ++ lib.optionals (isPy27) [

     

       42
       42
        
           future

     

       43
       43
        
         ];

     

       44
       44

+1 -1

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

···

       32
       32
        
           matplotlib

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
       -
         setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib";

     

       35
       35
       +
         setupPyBuildFlags = [ "-I${openems}/include" "-L${openems}/lib" "-R${openems}/lib" ];

     

       36
       36
        
       

     

       37
       37
        
         meta = with lib; {

     

       38
       38
        
           description = "Python interface to CSXCAD";

+1 -1

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

···

       54
       54
        
           pyyaml

     

       55
       55
        
           tqdm

     

       56
       56
        
           zeroconf

     

       57
       57
       -
         ] ++ lib.optional (pythonOlder "3.8") [

     

       57
       57
       +
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       58
       58
        
           importlib-metadata

     

       59
       59
        
         ];

     

       60
       60

+1 -1

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

···

       36
       36
        
           h5py

     

       37
       37
        
         ];

     

       38
       38
        
       

     

       39
       39
       -
         setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib";

     

       39
       39
       +
         setupPyBuildFlags = [ "-I${openems}/include" "-L${openems}/lib" "-R${openems}/lib" ];

     

       40
       40
        
         pythonImportsCheck = [ "openEMS" ];

     

       41
       41
        
       

     

       42
       42
        
         meta = with lib; {

+1 -1

pkgs/development/python-modules/python-telegram-bot/default.nix

···

       43
       43
        
             --replace "tornado==6.1" "tornado"

     

       44
       44
        
         '';

     

       45
       45
        
       

     

       46
       46
       -
         setupPyGlobalFlags = "--with-upstream-urllib3";

     

       46
       46
       +
         setupPyGlobalFlags = [ "--with-upstream-urllib3" ];

     

       47
       47
        
       

     

       48
       48
        
         # tests not included with release

     

       49
       49
        
         doCheck = false;

+1 -1

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

···

       46
       46
        
         ] ++ passthru.optional-dependencies.graphics;

     

       47
       47
        
       

     

       48
       48
        
         # Disabling OpenMP support on Darwin.

     

       49
       49
       -
         setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) [

     

       49
       49
       +
         setupPyGlobalFlags = lib.optionals (!stdenv.isDarwin) [

     

       50
       50
        
           "--with-openmp"

     

       51
       51
        
         ];

     

       52
       52

+1 -1

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

···

       68
       68
        
           # Requires network access

     

       69
       69
        
           "test_service"

     

       70
       70
        
           "testGuessFormatForParse"

     

       71
       71
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       71
       71
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       72
       72
        
           # Require loopback network access

     

       73
       73
        
           "TestGraphHTTP"

     

       74
       74
        
         ];

+2 -2

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

···

       35
       35
        
         propagatedBuildInputs = [

     

       36
       36
        
           CommonMark

     

       37
       37
        
           pygments

     

       38
       38
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       38
       38
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       39
       39
        
           dataclasses

     

       40
       40
       -
         ] ++ lib.optional (pythonOlder "3.9") [

     

       40
       40
       +
         ] ++ lib.optionals (pythonOlder "3.9") [

     

       41
       41
        
           typing-extensions

     

       42
       42
        
         ];

     

       43
       43

+1 -1

pkgs/development/python-modules/simple-di/default.nix

···

       23
       23
        
         propagatedBuildInputs = [

     

       24
       24
        
           setuptools

     

       25
       25
        
           typing-extensions

     

       26
       26
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       26
       26
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       27
       27
        
           dataclasses

     

       28
       28
        
         ];

     

       29
       29

+1 -1

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

···

       63
       63
        
           tqdm

     

       64
       64
        
           typer

     

       65
       65
        
           wasabi

     

       66
       66
       -
         ] ++ lib.optional (pythonOlder "3.8") [

     

       66
       66
       +
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       67
       67
        
           typing-extensions

     

       68
       68
        
         ];

     

       69
       69

+1 -1

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

···

       107
       107
        
           # requires imagemagick (increases build closure size), doesn't

     

       108
       108
        
           # test anything substantial

     

       109
       109
        
           "test_ext_imgconverter"

     

       110
       110
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       110
       110
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       111
       111
        
           # Due to lack of network sandboxing can't guarantee port 7777 isn't bound

     

       112
       112
        
           "test_inspect_main_url"

     

       113
       113
        
           "test_auth_header_uses_first_match"

+1 -1

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

···

       50
       50
        
           typing-extensions

     

       51
       51
        
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       52
       52
        
           contextlib2

     

       53
       53
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       53
       53
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       54
       54
        
           ApplicationServices

     

       55
       55
        
         ];

     

       56
       56

+1 -1

pkgs/development/python-modules/tensorflow/bin.nix

···

       82
       82
        
           ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];

     

       83
       83
        
       

     

       84
       84
        
         # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default

     

       85
       85
       -
         nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport [ addOpenGLRunpath patchelfUnstable ];

     

       85
       85
       +
         nativeBuildInputs = [ wheel ] ++ lib.optionals cudaSupport [ addOpenGLRunpath patchelfUnstable ];

     

       86
       86
        
       

     

       87
       87
        
         preConfigure = ''

     

       88
       88
        
           unset SOURCE_DATE_EPOCH

+1 -1

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

···

       483
       483
        
         ];

     

       484
       484
        
       

     

       485
       485
        
         # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default

     

       486
       486
       -
         nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath patchelfUnstable ];

     

       486
       486
       +
         nativeBuildInputs = lib.optionals cudaSupport [ addOpenGLRunpath patchelfUnstable ];

     

       487
       487
        
       

     

       488
       488
        
         postFixup = lib.optionalString cudaSupport ''

     

       489
       489
        
           find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do

+2 -2

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

···

       66
       66
        
           tqdm

     

       67
       67
        
           pydantic

     

       68
       68
        
           wasabi

     

       69
       69
       -
         ] ++ lib.optional (pythonOlder "3.8") [

     

       69
       69
       +
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       70
       70
        
           typing-extensions

     

       71
       71
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       71
       71
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       72
       72
        
           contextvars

     

       73
       73
        
           dataclasses

     

       74
       74
        
         ];

+1 -1

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

···

       25
       25
        
         checkInputs = [

     

       26
       26
        
           pytestCheckHook

     

       27
       27
        
           pytest-subtests

     

       28
       28
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       28
       28
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       29
       29
        
           importlib-resources

     

       30
       30
        
         ];

     

       31
       31

+1 -1

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

···

       157
       157
        
       

     

       158
       158
        
         # Disable test that fails on darwin due to issue with python3Packages.psutil:

     

       159
       159
        
         # https://github.com/giampaolo/psutil/issues/1219

     

       160
       160
       -
         disabledTests = lib.optional stdenv.isDarwin [

     

       160
       160
       +
         disabledTests = lib.optionals stdenv.isDarwin [

     

       161
       161
        
           "test_tpu_system_stats"

     

       162
       162
        
         ];

     

       163
       163

+1 -1

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

···

       56
       56
        
           protobuf

     

       57
       57
        
           requests

     

       58
       58
        
           websockets

     

       59
       59
       -
         ] ++ lib.optional (pythonOlder "3.8") [

     

       59
       59
       +
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       60
       60
        
           typing-extensions

     

       61
       61
        
         ] ++ eth-hash.optional-dependencies.pycryptodome;

     

       62
       62

+1 -1

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

···

       30
       30
        
         disabledTests = [

     

       31
       31
        
           # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373

     

       32
       32
        
           "test_find_files_recursively"

     

       33
       33
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       33
       33
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       34
       34
        
           # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307

     

       35
       35
        
           "test_locale_accents"

     

       36
       36
        
           "test_locale_case"

+4 -4

pkgs/development/tools/analysis/radare2/default.nix

···

       97
       97
        
           zlib

     

       98
       98
        
           openssl

     

       99
       99
        
           libuv

     

       100
       100
       -
         ] ++ lib.optional useX11 [ gtkdialog vte gtk2 ]

     

       101
       101
       -
           ++ lib.optional rubyBindings [ ruby ]

     

       102
       102
       -
           ++ lib.optional pythonBindings [ python3 ]

     

       103
       103
       -
           ++ lib.optional luaBindings [ lua ];

     

       100
       100
       +
         ] ++ lib.optionals useX11 [ gtkdialog vte gtk2 ]

     

       101
       101
       +
           ++ lib.optionals rubyBindings [ ruby ]

     

       102
       102
       +
           ++ lib.optionals pythonBindings [ python3 ]

     

       103
       103
       +
           ++ lib.optionals luaBindings [ lua ];

     

       104
       104
        
       

     

       105
       105
        
         propagatedBuildInputs = [

     

       106
       106
        
           # radare2 exposes r_lib which depends on these libraries

+1 -1

pkgs/development/tools/analysis/rr/zen_workaround.nix

···

       22
       22
        
         postConfigure = ''

     

       23
       23
        
           makeFlags="$makeFlags M=$(pwd)"

     

       24
       24
        
         '';

     

       25
       25
       -
         buildFlags = "modules";

     

       25
       25
       +
         buildFlags = [ "modules" ];

     

       26
       26
        
       

     

       27
       27
        
         installPhase = let

     

       28
       28
        
           modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel"; #TODO: longer path?

+1 -1

pkgs/development/tools/analysis/sparse/default.nix

···

       20
       20
        
         nativeBuildInputs = [ pkg-config ];

     

       21
       21
        
         buildInputs = [ gtk3 libxml2 llvm perl sqlite ];

     

       22
       22
        
         doCheck = true;

     

       23
       23
       -
         buildFlags = "GCC_BASE:=${GCC_BASE}";

     

       23
       23
       +
         buildFlags = [ "GCC_BASE:=${GCC_BASE}" ];

     

       24
       24
        
       

     

       25
       25
        
         passthru.tests = {

     

       26
       26
        
           simple-execution = callPackage ./tests.nix { };

+7 -1

pkgs/development/tools/database/prisma-engines/default.nix

···

       45
       45
        
           export SQLITE_MAX_EXPR_DEPTH=10000

     

       46
       46
        
         '';

     

       47
       47
        
       

     

       48
       48
       -
         cargoBuildFlags = "-p query-engine -p query-engine-node-api -p migration-engine-cli -p introspection-core -p prisma-fmt";

     

       48
       48
       +
         cargoBuildFlags = [

     

       49
       49
       +
           "-p" "query-engine"

     

       50
       50
       +
           "-p" "query-engine-node-api"

     

       51
       51
       +
           "-p" "migration-engine-cli"

     

       52
       52
       +
           "-p" "introspection-core"

     

       53
       53
       +
           "-p" "prisma-fmt"

     

       54
       54
       +
         ];

     

       49
       55
        
       

     

       50
       56
        
         postInstall = ''

     

       51
       57
        
           mv $out/lib/libquery_engine${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libquery_engine.node

+1 -1

pkgs/development/tools/godot/default.nix

···

       67
       67
        
       

     

       68
       68
        
         enableParallelBuilding = true;

     

       69
       69
        
       

     

       70
       70
       -
         sconsFlags = "target=release_debug platform=x11";

     

       70
       70
       +
         sconsFlags = [ "target=release_debug" "platform=x11" ];

     

       71
       71
        
         preConfigure = ''

     

       72
       72
        
           sconsFlags+=" ${

     

       73
       73
        
             lib.concatStringsSep " "

+1 -1

pkgs/development/tools/godot/export-templates.nix

···

       3
       3
        
       # https://docs.godotengine.org/en/stable/development/compiling/compiling_for_x11.html#building-export-templates

     

       4
       4
        
       godot.overrideAttrs (oldAttrs: rec {

     

       5
       5
        
         pname = "godot-export-templates";

     

       6
       6
       -
         sconsFlags = "target=release platform=x11 tools=no";

     

       6
       6
       +
         sconsFlags = [ "target=release" "platform=x11" "tools=no" ];

     

       7
       7
        
         installPhase = ''

     

       8
       8
        
           # The godot export command expects the export templates at

     

       9
       9
        
           # .../share/godot/templates/3.2.3.stable with 3.2.3 being the godot version.

+1 -1

pkgs/development/tools/godot/headless.nix

···

       1
       1
        
       { godot, lib }:

     

       2
       2
        
       godot.overrideAttrs (oldAttrs: rec {

     

       3
       3
        
         pname = "godot-headless";

     

       4
       4
       -
         sconsFlags = "target=release_debug platform=server tools=yes";

     

       4
       4
       +
         sconsFlags = [ "target=release_debug" "platform=server" "tools=yes" ];

     

       5
       5
        
         installPhase = ''

     

       6
       6
        
           mkdir -p "$out/bin"

     

       7
       7
        
           cp bin/godot_server.* $out/bin/godot-headless

+1 -1

pkgs/development/tools/godot/server.nix

···

       1
       1
        
       { godot, lib }:

     

       2
       2
        
       godot.overrideAttrs (oldAttrs: rec {

     

       3
       3
        
         pname = "godot-server";

     

       4
       4
       -
         sconsFlags = "target=release platform=server tools=no";

     

       4
       4
       +
         sconsFlags = [ "target=release" "platform=server" "tools=no" ];

     

       5
       5
        
         installPhase = ''

     

       6
       6
        
           mkdir -p "$out/bin"

     

       7
       7
        
           cp bin/godot_server.* $out/bin/godot-server

+1 -1

pkgs/development/tools/misc/bashdb/default.nix

···

       23
       23
        
             sha256 = "19zfzcnxavndyn6kfxp775kjcd0gigsm4y3bnh6fz5ilhnnbbbgr";

     

       24
       24
        
           })

     

       25
       25
        
         ];

     

       26
       26
       -
         patchFlags = "-p0";

     

       26
       26
       +
         patchFlags = [ "-p0" ];

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

     

       29
       29
        
           makeWrapper

+1 -1

pkgs/development/tools/misc/pahole/default.nix

···

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       13
       13
        
         buildInputs = [ elfutils zlib libbpf ]

     

       14
       14
       -
           ++ lib.optional stdenv.hostPlatform.isMusl [

     

       14
       14
       +
           ++ lib.optionals stdenv.hostPlatform.isMusl [

     

       15
       15
        
           argp-standalone

     

       16
       16
        
           musl-obstack

     

       17
       17
        
         ];

+2 -2

pkgs/development/tools/misc/pkg-config/default.nix

···

       28
       28
        
         buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;

     

       29
       29
        
       

     

       30
       30
        
         configureFlags = [ "--with-internal-glib" ]

     

       31
       31
       -
           ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]

     

       31
       31
       +
           ++ optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]

     

       32
       32
        
              # Can't run these tests while cross-compiling

     

       33
       33
       -
           ++ optional (stdenv.hostPlatform != stdenv.buildPlatform)

     

       33
       33
       +
           ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)

     

       34
       34
        
              [ "glib_cv_stack_grows=no"

     

       35
       35
        
                "glib_cv_uscore=no"

     

       36
       36
        
                "ac_cv_func_posix_getpwuid_r=yes"

+1 -1

pkgs/development/tools/ocaml/dune/2.nix

···

       16
       16
        
         nativeBuildInputs = [ ocaml findlib ];

     

       17
       17
        
         strictDeps = true;

     

       18
       18
        
       

     

       19
       19
       -
         buildFlags = "release";

     

       19
       19
       +
         buildFlags = [ "release" ];

     

       20
       20
        
       

     

       21
       21
        
         dontAddPrefix = true;

     

       22
       22
        
         dontAddStaticConfigureFlags = true;

+1 -1

pkgs/development/tools/ocaml/dune/3.nix

···

       21
       21
        
       

     

       22
       22
        
         strictDeps = true;

     

       23
       23
        
       

     

       24
       24
       -
         buildFlags = "release";

     

       24
       24
       +
         buildFlags = [ "release" ];

     

       25
       25
        
       

     

       26
       26
        
         dontAddPrefix = true;

     

       27
       27
        
         dontAddStaticConfigureFlags = true;

+1 -1

pkgs/development/tools/parsing/ragel/default.nix

···

       13
       13
        
               inherit sha256;

     

       14
       14
        
             };

     

       15
       15
        
       

     

       16
       16
       -
             buildInputs = lib.optional build-manual [ fig2dev ghostscript tex ];

     

       16
       16
       +
             buildInputs = lib.optionals build-manual [ fig2dev ghostscript tex ];

     

       17
       17
        
       

     

       18
       18
        
             preConfigure = lib.optionalString build-manual ''

     

       19
       19
        
               sed -i "s/build_manual=no/build_manual=yes/g" DIST

+5 -5

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix

···

       385
       385
        
                 (

     

       386
       386
        
                   old: {

     

       387
       387
        
                     nativeBuildInputs = (old.nativeBuildInputs or [ ])

     

       388
       388
       -
                       ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]

     

       388
       388
       +
                       ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]

     

       389
       389
        
                       ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi

     

       390
       390
        
                       ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel)

     

       391
       391
        
                       (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);

     
···

       1061
       1061
        
       

     

       1062
       1062
        
                 buildInputs = old.buildInputs or [ ] ++ [

     

       1063
       1063
        
                   pkgs.which

     

       1064
       1064
       -
                 ] ++ lib.optional enableGhostscript [

     

       1064
       1064
       +
                 ] ++ lib.optionals enableGhostscript [

     

       1065
       1065
        
                   pkgs.ghostscript

     

       1066
       1066
       -
                 ] ++ lib.optional stdenv.isDarwin [

     

       1066
       1066
       +
                 ] ++ lib.optionals stdenv.isDarwin [

     

       1067
       1067
        
                   Cocoa

     

       1068
       1068
        
                 ];

     

       1069
       1069
        
       

     
···

       1080
       1080
        
       

     

       1081
       1081
        
                 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [

     

       1082
       1082
        
                   pkg-config

     

       1083
       1083
       -
                 ] ++ lib.optional (lib.versionAtLeast super.matplotlib.version "3.5.0") [

     

       1083
       1083
       +
                 ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [

     

       1084
       1084
        
                   self.setuptools-scm

     

       1085
       1085
        
                   self.setuptools-scm-git-archive

     

       1086
       1086
        
                 ];

     
···

       2029
       2029
        
               if old.format != "wheel" then {

     

       2030
       2030
        
                 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++

     

       2031
       2031
        
                   [ pkgs.gfortran ] ++

     

       2032
       2032
       -
                   lib.optional (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ];

     

       2032
       2032
       +
                   lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ];

     

       2033
       2033
        
                 propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ];

     

       2034
       2034
        
                 setupPyBuildFlags = [ "--fcompiler='gnu95'" ];

     

       2035
       2035
        
                 enableParallelBuilding = true;

+1 -1

pkgs/development/tools/summon/default.nix

···

       19
       19
        
       

     

       20
       20
        
         # Patches provider resolver to support resolving unqualified names

     

       21
       21
        
         # from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)`

     

       22
       22
       -
         patches = optional patchResolver [ ./resolve-paths.patch ];

     

       22
       22
       +
         patches = optionals patchResolver [ ./resolve-paths.patch ];

     

       23
       23
        
       

     

       24
       24
        
         postInstall = ''

     

       25
       25
        
           mv $out/bin/cmd $out/bin/summon

+1 -1

pkgs/games/anki/default.nix

···

       101
       101
        
           setuptools

     

       102
       102
        
         ]

     

       103
       103
        
         ++ lib.optional plotsSupport matplotlib

     

       104
       104
       -
         ++ lib.optional stdenv.isDarwin [ CoreAudio ]

     

       104
       104
       +
         ++ lib.optionals stdenv.isDarwin [ CoreAudio ]

     

       105
       105
        
         ;

     

       106
       106
        
       

     

       107
       107
        
         checkInputs = [ pytest glibcLocales nose ];

+1 -1

pkgs/games/blightmud/default.nix

···

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ pkg-config ];

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ alsa-lib openssl ] ++ lib.optional withTTS [ speechd ];

     

       21
       21
       +
         buildInputs = [ alsa-lib openssl ] ++ lib.optionals withTTS [ speechd ];

     

       22
       22
        
       

     

       23
       23
        
         # Building the speech-dispatcher-sys crate for TTS support requires setting

     

       24
       24
        
         # LIBCLANG_PATH.

+1 -1

pkgs/games/darkplaces/default.nix

···

       23
       23
        
           SDL2

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
       -
         buildFlags = "release";

     

       26
       26
       +
         buildFlags = [ "release" ];

     

       27
       27
        
       

     

       28
       28
        
         installPhase = ''

     

       29
       29
        
           runHook preInstall

+2 -2

pkgs/games/freeciv/default.nix

···

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ autoreconfHook pkg-config ]

     

       30
       30
       -
           ++ lib.optional qtClient [ qt5.wrapQtAppsHook ]

     

       31
       31
       -
           ++ lib.optional gtkClient [ wrapGAppsHook ];

     

       30
       30
       +
           ++ lib.optionals qtClient [ qt5.wrapQtAppsHook ]

     

       31
       31
       +
           ++ lib.optionals gtkClient [ wrapGAppsHook ];

     

       32
       32
        
       

     

       33
       33
        
         buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv icu ]

     

       34
       34
        
           ++ [ SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_gfx freetype fluidsynth ]

+1 -1

pkgs/games/gimx/default.nix

···

       37
       37
        
             --replace "5E048E021001" "6F0E13020001"

     

       38
       38
        
         '';

     

       39
       39
        
       

     

       40
       40
       -
         makeFlags = "build-core";

     

       40
       40
       +
         makeFlags = [ "build-core" ];

     

       41
       41
        
         installPhase = ''

     

       42
       42
        
           runHook preInstall

     

       43
       43

+2 -2

pkgs/games/xonotic/default.nix

···

       66
       66
        
       

     

       67
       67
        
           nativeBuildInputs = [ unzip ];

     

       68
       68
        
           buildInputs = [ libjpeg zlib libvorbis curl gmp ]

     

       69
       69
       -
             ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ]

     

       70
       70
       -
             ++ lib.optional withSDL [ SDL2.dev ];

     

       69
       69
       +
             ++ lib.optionals withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ]

     

       70
       70
       +
             ++ lib.optionals withSDL [ SDL2.dev ];

     

       71
       71
        
       

     

       72
       72
        
           sourceRoot = "Xonotic/source/darkplaces";

     

       73
       73

+1 -1

pkgs/misc/jackaudio/default.nix

···

       48
       48
        
               --replace /bin/bash ${bash}/bin/bash

     

       49
       49
        
         '';

     

       50
       50
        
       

     

       51
       51
       -
         dontAddWafCrossFlags = "true";

     

       51
       51
       +
         dontAddWafCrossFlags = true;

     

       52
       52
        
         wafConfigureFlags = [

     

       53
       53
        
           "--classic"

     

       54
       54
        
           "--autostart=${if (optDbus != null) then "dbus" else "classic"}"

+1 -1

pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix

···

       13
       13
        
       appleDerivation {

     

       14
       14
        
         nativeBuildInputs = [ python3 ];

     

       15
       15
        
       

     

       16
       16
       -
         depsBuildBuild = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ];

     

       16
       16
       +
         depsBuildBuild = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ];

     

       17
       17
        
       

     

       18
       18
        
         postPatch = ''

     

       19
       19
        
           substituteInPlace makefile \

+1 -1

pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix

···

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python3 ];

     

       14
       14
        
       

     

       15
       15
       -
         patches = lib.optional stdenv.isx86_64 [ ./python3.patch ];

     

       15
       15
       +
         patches = lib.optionals stdenv.isx86_64 [ ./python3.patch ];

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

     

       18
       18
        
           substituteInPlace Makefile \

+2 -2

pkgs/os-specific/darwin/libtapi/default.nix

···

       17
       17
        
         # Also means we don't have to manually fix the result with install_name_tool.

     

       18
       18
        
         patches = [

     

       19
       19
        
           ./disable-rpath.patch

     

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

     

       20
       20
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       21
       21
        
           # TODO: make unconditional and rebuild the world

     

       22
       22
        
           # TODO: send upstream

     

       23
       23
        
           ./native-clang-tblgen.patch

     
···

       30
       30
        
         buildInputs = [ ncurses ];

     

       31
       31
        
       

     

       32
       32
        
         cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ]

     

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

     

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

     

       34
       34
        
             "-DCMAKE_CROSSCOMPILING=True"

     

       35
       35
        
             # This package could probably have a llvm_6 llvm-tblgen and clang-tblgen

     

       36
       36
        
             # provided to reduce some building. This package seems intended to

+1 -1

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

···

       23
       23
        
         makeFlags = [

     

       24
       24
        
           "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

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

     

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

     

       26
       26
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

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

     

       28
       28
        
         ];

     

       29
       29

+1 -1

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

···

       16
       16
        
           substituteInPlace 60-gobi.rules --replace "/lib/firmware" "/run/current-system/firmware"

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
       -
         makeFlags = "prefix=${placeholder "out"}";

     

       19
       19
       +
         makeFlags = [ "prefix=${placeholder "out"}" ];

     

       20
       20
        
       

     

       21
       21
        
         meta = with lib; {

     

       22
       22
        
           description = "Firmware loader for Qualcomm Gobi USB chipsets";

+1 -1

pkgs/os-specific/linux/kernel-headers/default.nix

···

       27
       27
        
             flex bison python rsync

     

       28
       28
        
           ];

     

       29
       29
        
       

     

       30
       30
       -
           extraIncludeDirs = lib.optional (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) ["ppc"];

     

       30
       30
       +
           extraIncludeDirs = lib.optionals (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) ["ppc"];

     

       31
       31
        
       

     

       32
       32
        
           inherit patches;

     

       33
       33

+1 -1

pkgs/os-specific/linux/nvidia-x11/generic.nix

···

       101
       101
        
           nativeBuildInputs = [ perl nukeReferences ]

     

       102
       102
        
             ++ optionals (!libsOnly) kernel.moduleBuildDependencies;

     

       103
       103
        
       

     

       104
       104
       -
           disallowedReferences = optional (!libsOnly) [ kernel.dev ];

     

       104
       104
       +
           disallowedReferences = optionals (!libsOnly) [ kernel.dev ];

     

       105
       105
        
       

     

       106
       106
        
           passthru = {

     

       107
       107
        
             open = mapNullable (hash: callPackage ./open.nix {

+1 -1

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

···

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

     

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

     

       30
       30
        
           ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n"))

     

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

     

       31
       31
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

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

     

       33
       33
        
         ];

     

       34
       34

+1 -1

pkgs/servers/dante/default.nix

···

       19
       19
        
       

     

       20
       20
        
         dontAddDisableDepTrack = stdenv.isDarwin;

     

       21
       21
        
       

     

       22
       22
       -
         patches = lib.optional stdenv.hostPlatform.isMips64 [

     

       22
       22
       +
         patches = lib.optionals stdenv.hostPlatform.isMips64 [

     

       23
       23
        
           (fetchpatch {

     

       24
       24
        
             name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";

     

       25
       25
        
             url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch";

+1 -1

pkgs/servers/dns/knot-dns/default.nix

···

       49
       49
        
         CFLAGS = [ "-O2" "-DNDEBUG" ];

     

       50
       50
        
       

     

       51
       51
        
         doCheck = true;

     

       52
       52
       -
         checkFlags = "V=1"; # verbose output in case some test fails

     

       52
       52
       +
         checkFlags = [ "V=1" ]; # verbose output in case some test fails

     

       53
       53
        
         doInstallCheck = true;

     

       54
       54
        
       

     

       55
       55
        
         postInstall = ''

+1 -1

pkgs/servers/foundationdb/cmake.nix

···

       33
       33
        
       

     

       34
       34
        
               buildInputs = [ libressl boost ];

     

       35
       35
        
               nativeBuildInputs = [ cmake ninja python3 openjdk mono ]

     

       36
       36
       -
                 ++ lib.optional useClang [ llvmPackages.lld ];

     

       36
       36
       +
                 ++ lib.optionals useClang [ llvmPackages.lld ];

     

       37
       37
        
       

     

       38
       38
        
               separateDebugInfo = true;

     

       39
       39
        
               dontFixCmake = true;

+2 -2

pkgs/servers/foundationdb/vsmake.nix

···

       84
       84
        
               makeFlags = [ "all" "fdb_java" "fdb_python" ]

     

       85
       85
        
                 # Don't compile FDBLibTLS if we don't need it in 6.0 or later;

     

       86
       86
        
                 # it gets statically linked in

     

       87
       87
       -
                 ++ lib.optional (lib.versionOlder version "6.0") [ "fdb_c" ]

     

       87
       87
       +
                 ++ lib.optionals (lib.versionOlder version "6.0") [ "fdb_c" ]

     

       88
       88
        
                 # Needed environment overrides

     

       89
       89
        
                 ++ [ "KVRELEASE=1"

     

       90
       90
        
                      "NOSTRIP=1"

     

       91
       91
       -
                    ] ++ lib.optional officialRelease [ "RELEASE=true" ];

     

       91
       91
       +
                    ] ++ lib.optionals officialRelease [ "RELEASE=true" ];

     

       92
       92
        
       

     

       93
       93
        
               # on 6.0 and later, we can specify all this information manually

     

       94
       94
        
               configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''

+1 -1

pkgs/servers/geospatial/mapserver/default.nix

···

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
        
           cmake

     

       20
       20
        
           pkg-config

     

       21
       21
       -
         ] ++ lib.optional withPython [ swig python3.pkgs.setuptools ];

     

       21
       21
       +
         ] ++ lib.optionals withPython [ swig python3.pkgs.setuptools ];

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

     

       24
       24
        
           cairo

+1 -1

pkgs/servers/matrix-conduit/default.nix

···

       22
       22
        
           rocksdb

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       -
         cargoBuildFlags = "--bin conduit";

     

       25
       25
       +
         cargoBuildFlags = [ "--bin" "conduit" ];

     

       26
       26
        
       

     

       27
       27
        
         meta = with lib; {

     

       28
       28
        
           broken = stdenv.isDarwin;

+1 -1

pkgs/servers/misc/oven-media-engine/default.nix

···

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         sourceRoot = "source/src";

     

       32
       32
       -
         makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}";

     

       32
       32
       +
         makeFlags = [ "release" "CONFIG_LIBRARY_PATHS=" "CONFIG_PKG_PATHS=" "GLOBAL_CC=$(CC)" "GLOBAL_CXX=$(CXX)" "GLOBAL_LD=$(CXX)" "SHELL=${stdenv.shell}" ];

     

       33
       33
        
         enableParallelBuilding = true;

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [ bc pkg-config perl ];

+1 -1

pkgs/servers/nosql/dragonflydb/default.nix

···

       87
       87
        
           "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"

     

       88
       88
        
         ];

     

       89
       89
        
       

     

       90
       90
       -
         ninjaFlags = "dragonfly";

     

       90
       90
       +
         ninjaFlags = [ "dragonfly" ];

     

       91
       91
        
       

     

       92
       92
        
         doCheck = false;

     

       93
       93
        
         dontUseNinjaInstall = true;

+1 -1

pkgs/servers/nosql/redis/default.nix

···

       25
       25
        
         # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!

     

       26
       26
        
         makeFlags = [ "PREFIX=${placeholder "out"}" ]

     

       27
       27
        
           ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]

     

       28
       28
       -
           ++ lib.optional withSystemd [ "USE_SYSTEMD=yes" ]

     

       28
       28
       +
           ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]

     

       29
       29
        
           ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];

     

       30
       30
        
       

     

       31
       31
        
         enableParallelBuilding = true;

+1 -1

pkgs/servers/samba/4.x.nix

···

       141
       141
        
           ++ optional (!enablePam) "--without-pam"

     

       142
       142
        
           ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       143
       143
        
           "--bundled-libraries=!asn1_compile,!compile_et"

     

       144
       144
       -
         ] ++ optional stdenv.isAarch32 [

     

       144
       144
       +
         ] ++ optionals stdenv.isAarch32 [

     

       145
       145
        
           # https://bugs.gentoo.org/683148

     

       146
       146
        
           "--jobs 1"

     

       147
       147
        
         ];

+6 -6

pkgs/servers/sql/mariadb/default.nix

···

       44
       44
        
           ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ]

     

       45
       45
        
           ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ]))

     

       46
       46
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]

     

       47
       47
       -
           ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]

     

       47
       47
       +
           ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ]

     

       48
       48
        
           ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ])

     

       49
       49
        
           ++ (if (lib.versionOlder version "10.6")

     

       50
       50
        
             then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ]

     
···

       203
       203
        
           "-DWITHOUT_EXAMPLE=1"

     

       204
       204
        
           "-DWITHOUT_FEDERATED=1"

     

       205
       205
        
           "-DWITHOUT_TOKUDB=1"

     

       206
       206
       -
         ] ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [

     

       206
       206
       +
         ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [

     

       207
       207
        
           "-DWITH_NUMA=ON"

     

       208
       208
       -
         ] ++ lib.optional (!withStorageMroonga) [

     

       208
       208
       +
         ] ++ lib.optionals (!withStorageMroonga) [

     

       209
       209
        
           "-DWITHOUT_MROONGA=1"

     

       210
       210
       -
         ] ++ lib.optional (!withStorageRocks) [

     

       210
       210
       +
         ] ++ lib.optionals (!withStorageRocks) [

     

       211
       211
        
           "-DWITHOUT_ROCKSDB=1"

     

       212
       212
       -
         ] ++ lib.optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [

     

       212
       212
       +
         ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withStorageRocks) [

     

       213
       213
        
           "-DWITH_ROCKSDB_JEMALLOC=ON"

     

       214
       214
       -
         ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [

     

       214
       214
       +
         ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

     

       215
       215
        
           "-DWITH_JEMALLOC=yes"

     

       216
       216
        
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       217
       217
        
           "-DPLUGIN_AUTH_PAM=NO"

+1 -1

pkgs/shells/bash/5.1.nix

···

       86
       86
        
       

     

       87
       87
        
         enableParallelBuilding = true;

     

       88
       88
        
       

     

       89
       89
       -
         makeFlags = optional stdenv.hostPlatform.isCygwin [

     

       89
       89
       +
         makeFlags = optionals stdenv.hostPlatform.isCygwin [

     

       90
       90
        
           "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a"

     

       91
       91
        
           "SHOBJ_LIBS=-lbash"

     

       92
       92
        
         ];

+1 -1

pkgs/shells/ion/default.nix

···

       20
       20
        
           maintainers = with maintainers; [ dywedir ];

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = lib.optional stdenv.hostPlatform.isDarwin [

     

       23
       23
       +
         buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

     

       24
       24
        
           Security

     

       25
       25
        
           libiconv

     

       26
       26
        
         ];

+1 -1

pkgs/tools/X11/find-cursor/default.nix

···

       14
       14
        
         nativeBuildInputs = [ installShellFiles git ];

     

       15
       15
        
         buildInputs = [ libX11 libXdamage libXrender libXcomposite libXext ];

     

       16
       16
        
         preInstall = "mkdir -p $out/share/man/man1";

     

       17
       17
       -
         installFlags = "PREFIX=${placeholder "out"}";

     

       17
       17
       +
         installFlags = [ "PREFIX=${placeholder "out"}" ];

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Simple XLib program to highlight the cursor position";

+1 -1

pkgs/tools/X11/xmousepasteblock/default.nix

···

       9
       9
        
           sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns";

     

       10
       10
        
           rev = version;

     

       11
       11
        
         };

     

       12
       12
       -
         makeFlags = "PREFIX=$(out)";

     

       12
       12
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       13
       13
        
         buildInputs = with xorg; [ libX11 libXext libXi libev ];

     

       14
       14
        
         nativeBuildInputs = [ pkg-config ];

     

       15
       15
        
         meta = with lib; {

+1 -1

pkgs/tools/cd-dvd/dvdisaster/default.nix

···

       21
       21
        
         nativeBuildInputs = [ gettext pkg-config which ];

     

       22
       22
        
         buildInputs = [ glib gtk2 ];

     

       23
       23
        
       

     

       24
       24
       -
         patches = lib.optional enableSoftening [

     

       24
       24
       +
         patches = lib.optionals enableSoftening [

     

       25
       25
        
           ./encryption.patch

     

       26
       26
        
           ./dvdrom.patch

     

       27
       27
        
         ];

+1 -1

pkgs/tools/compression/bsdiff/default.nix

···

       17
       17
        
           })

     

       18
       18
        
           ./CVE-2020-14315.patch

     

       19
       19
        
           ./include-systypes.patch

     

       20
       20
       -
         ] ++ lib.optional stdenv.hostPlatform.isLinux [

     

       20
       20
       +
         ] ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       21
       21
        
           (fetchpatch {

     

       22
       22
        
             url = "https://sources.debian.org/data/main/b/bsdiff/4.3-22/debian/patches/30-bug-632585-mmap-src-file-instead-of-malloc-read-it.patch";

     

       23
       23
        
             sha256 = "sha256-esbhz2/efUiuQDuF7LGfSeEn3/f1WbqCxQpTs2A0ulI=";

+1 -1

pkgs/tools/graphics/mangohud/default.nix

···

       108
       108
        
             libdbus = dbus.lib;

     

       109
       109
        
             inherit hwdata libX11;

     

       110
       110
        
           })

     

       111
       111
       -
         ] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") [

     

       111
       111
       +
         ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [

     

       112
       112
        
           # Support 32bit OpenGL applications by appending the mangohud32

     

       113
       113
        
           # lib path to LD_LIBRARY_PATH.

     

       114
       114
        
           #

+1 -1

pkgs/tools/misc/hiksink/default.nix

···

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

     

       28
       28
        
           openssl

     

       29
       29
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       29
       29
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       30
       30
        
           Security

     

       31
       31
        
         ];

     

       32
       32

+1 -1

pkgs/tools/misc/jsonwatch/default.nix

···

       18
       18
        
       

     

       19
       19
        
         cargoSha256 = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc=";

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = lib.optional stdenv.isDarwin [

     

       21
       21
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       22
       22
        
           Security

     

       23
       23
        
         ];

     

       24
       24

+1 -1

pkgs/tools/misc/less/default.nix

···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.

     

       13
       13
       -
           ++ lib.optional lessSecure [ "--with-secure" ];

     

       13
       13
       +
           ++ lib.optionals lessSecure [ "--with-secure" ];

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ ncurses ];

     

       16
       16

+1 -1

pkgs/tools/misc/man-db/default.nix

···

       53
       53
        
           "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"

     

       54
       54
        
           "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"

     

       55
       55
        
           "--with-pager=less"

     

       56
       56
       -
         ] ++ lib.optional stdenv.hostPlatform.isDarwin [

     

       56
       56
       +
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       57
       57
        
           "ac_cv_func__set_invalid_parameter_handler=no"

     

       58
       58
        
           "ac_cv_func_posix_fadvise=no"

     

       59
       59
        
           "ac_cv_func_mempcpy=no"

+1 -1

pkgs/tools/misc/otfcc/default.nix

···

       18
       18
        
           ./move-makefiles.patch

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       -
         buildFlags = lib.optional stdenv.isAarch64 [ "config=release_arm" ];

     

       21
       21
       +
         buildFlags = lib.optionals stdenv.isAarch64 [ "config=release_arm" ];

     

       22
       22
        
       

     

       23
       23
        
         installPhase = ''

     

       24
       24
        
           mkdir -p $out/bin

+2 -2

pkgs/tools/misc/pre-commit/default.nix

···

       37
       37
        
           pyyaml

     

       38
       38
        
           toml

     

       39
       39
        
           virtualenv

     

       40
       40
       -
         ] ++ lib.optional (pythonOlder "3.8") [

     

       40
       40
       +
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       41
       41
        
           importlib-metadata

     

       42
       42
       -
         ] ++ lib.optional (pythonOlder "3.7") [

     

       42
       42
       +
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       43
       43
        
           importlib-resources

     

       44
       44
        
         ];

     

       45
       45

+1 -1

pkgs/tools/misc/rust-motd/default.nix

···

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

     

       28
       28
        
           openssl

     

       29
       29
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       29
       29
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       30
       30
        
           Security

     

       31
       31
        
         ];

     

       32
       32

+1 -1

pkgs/tools/misc/sheldon/default.nix

···

       20
       20
        
       

     

       21
       21
        
         cargoSha256 = "sha256-uRcaHuDLQm6OYqt01kLbW/mfZnL4HaDabaweaw1EOfs=";

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin [ Security curl ];

     

       23
       23
       +
         buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];

     

       24
       24
        
         nativeBuildInputs = [ installShellFiles pkg-config ];

     

       25
       25
        
       

     

       26
       26
        
         # Needs network connection

+1 -1

pkgs/tools/misc/ttwatch/default.nix

···

       17
       17
        
         nativeBuildInputs = [ cmake perl pkg-config ];

     

       18
       18
        
         buildInputs = [ openssl curl libusb1 protobufc ];

     

       19
       19
        
       

     

       20
       20
       -
         cmakeFlags = lib.optional enableUnsafe [ "-Dunsafe=on" ];

     

       20
       20
       +
         cmakeFlags = lib.optionals enableUnsafe [ "-Dunsafe=on" ];

     

       21
       21
        
       

     

       22
       22
        
         preFixup = ''

     

       23
       23
        
           chmod +x $out/bin/ttbin2mysports

+1 -1

pkgs/tools/networking/bore-cli/default.nix

···

       18
       18
        
       

     

       19
       19
        
         cargoSha256 = "sha256-ZnEVTFiPo3AFyo1BoV88X2nCqYzRK6PkcbawiR+QnV0=";

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = lib.optional stdenv.isDarwin [

     

       21
       21
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       22
       22
        
           Security

     

       23
       23
        
         ];

     

       24
       24

+1 -1

pkgs/tools/networking/bore/default.nix

···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx";

     

       15
       15
       -
         cargoBuildFlags = "-p ${pname}";

     

       15
       15
       +
         cargoBuildFlags = [ "-p" pname ];

     

       16
       16
        
       

     

       17
       17
        
         # FIXME can’t test --all-targets and --doc in a single invocation

     

       18
       18
        
         cargoTestFlags = [ "--all-targets" "--workspace" ];

+1 -1

pkgs/tools/networking/eternal-terminal/default.nix

···

       43
       43
        
           "-DDISABLE_CRASH_LOG=TRUE"

     

       44
       44
        
         ];

     

       45
       45
        
       

     

       46
       46
       -
         CXXFLAGS = lib.optional stdenv.cc.isClang [

     

       46
       46
       +
         CXXFLAGS = lib.optionals stdenv.cc.isClang [

     

       47
       47
        
           "-std=c++17"

     

       48
       48
        
         ];

     

       49
       49

+3 -3

pkgs/tools/networking/ipv6calc/default.nix

···

       43
       43
        
           "--disable-bundled-md5"

     

       44
       44
        
           "--disable-dynamic-load"

     

       45
       45
        
           "--enable-shared"

     

       46
       46
       -
         ] ++ lib.optional (libmaxminddb != null) [

     

       46
       46
       +
         ] ++ lib.optionals (libmaxminddb != null) [

     

       47
       47
        
           "--enable-mmdb"

     

       48
       48
       -
         ] ++ lib.optional (geolite-legacy != null) [

     

       48
       48
       +
         ] ++ lib.optionals (geolite-legacy != null) [

     

       49
       49
        
           "--with-geoip-db=${geolite-legacy}/share/GeoIP"

     

       50
       50
       -
         ] ++ lib.optional (ip2location-c != null) [

     

       50
       50
       +
         ] ++ lib.optionals (ip2location-c != null) [

     

       51
       51
        
           "--enable-ip2location"

     

       52
       52
        
         ];

     

       53
       53

+1 -1

pkgs/tools/networking/rathole/default.nix

···

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ pkg-config ];

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin [ CoreServices ];

     

       24
       24
       +
         buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];

     

       25
       25
        
       

     

       26
       26
        
         __darwinAllowLocalNetworking = true;

     

       27
       27

+1 -1

pkgs/tools/networking/termscp/default.nix

···

       33
       33
        
           dbus

     

       34
       34
        
           libssh

     

       35
       35
        
           openssl

     

       36
       36
       -
         ] ++ lib.optional stdenv.isDarwin [

     

       36
       36
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       37
       37
        
           AppKit

     

       38
       38
        
           Cocoa

     

       39
       39
        
           Foundation

+1 -1

pkgs/tools/networking/toxvpn/default.nix

···

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ cmake ];

     

       28
       28
        
       

     

       29
       29
       -
         cmakeFlags = lib.optional stdenv.isLinux [ "-DSYSTEMD=1" ];

     

       29
       29
       +
         cmakeFlags = lib.optionals stdenv.isLinux [ "-DSYSTEMD=1" ];

     

       30
       30
        
       

     

       31
       31
        
         postInstall = "$out/bin/toxvpn -h";

     

       32
       32

+1 -1

pkgs/tools/networking/unbound/default.nix

···

       75
       75
        
           "--with-rootkey-file=${dns-root-data}/root.key"

     

       76
       76
        
           "--enable-pie"

     

       77
       77
        
           "--enable-relro-now"

     

       78
       78
       -
         ] ++ lib.optional stdenv.hostPlatform.isStatic [

     

       78
       78
       +
         ] ++ lib.optionals stdenv.hostPlatform.isStatic [

     

       79
       79
        
           "--disable-flto"

     

       80
       80
        
         ] ++ lib.optionals withSystemd [

     

       81
       81
        
           "--enable-systemd"

+1 -1

pkgs/tools/networking/vde2/default.nix

···

       11
       11
        
           sha256 = "sha256-Yf6QB7j5lYld2XtqhYspK4037lTtimoFc7nCavCP+mU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         patches = lib.optional stdenv.hostPlatform.isMusl [

     

       14
       14
       +
         patches = lib.optionals stdenv.hostPlatform.isMusl [

     

       15
       15
        
           (fetchpatch {

     

       16
       16
        
             url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238";

     

       17
       17
        
             sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af";

+1 -1

pkgs/tools/networking/wg-netmanager/default.nix

···

       17
       17
        
       

     

       18
       18
        
         # Test 01 tries to create a wireguard interface, which requires sudo.

     

       19
       19
        
         doCheck = true;

     

       20
       20
       -
         checkFlags = "--skip device";

     

       20
       20
       +
         checkFlags = [ "--skip" "device" ];

     

       21
       21
        
       

     

       22
       22
        
         meta = with lib; {

     

       23
       23
        
           description = "Wireguard network manager";

+1 -1

pkgs/tools/package-management/nix/common.nix

···

       113
       113
        
       

     

       114
       114
        
         propagatedBuildInputs = [

     

       115
       115
        
           boehmgc

     

       116
       116
       -
         ] ++ lib.optional (atLeast27) [

     

       116
       116
       +
         ] ++ lib.optionals (atLeast27) [

     

       117
       117
        
           nlohmann_json

     

       118
       118
        
         ];

     

       119
       119

+1 -1

pkgs/tools/security/asc-key-to-qr-code-gif/default.nix

···

       23
       23
        
           substitutions = [

     

       24
       24
        
             ''--replace "convert" "${imagemagick}/bin/convert"''

     

       25
       25
        
             ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"''

     

       26
       26
       -
           ] ++ lib.optional testQR [

     

       26
       26
       +
           ] ++ lib.optionals testQR [

     

       27
       27
        
             ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS

     

       28
       28
        
             ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"''

     

       29
       29
        
           ];

+1 -1

pkgs/tools/security/chipsec/default.nix

···

       48
       48
        
       

     

       49
       49
        
         setupPyBuildFlags = [

     

       50
       50
        
           "--build-lib=$CHIPSEC_BUILD_LIB"

     

       51
       51
       -
         ] ++ lib.optional (!withDriver) [

     

       51
       51
       +
         ] ++ lib.optionals (!withDriver) [

     

       52
       52
        
           "--skip-driver"

     

       53
       53
        
         ];

     

       54
       54

+1 -1

pkgs/tools/security/rhash/default.nix

···

       46
       46
        
         installTargets = [

     

       47
       47
        
           "install"

     

       48
       48
        
           "install-lib-headers"

     

       49
       49
       -
         ] ++ lib.optional (!enableStatic) [

     

       49
       49
       +
         ] ++ lib.optionals (!enableStatic) [

     

       50
       50
        
           "install-lib-so-link"

     

       51
       51
        
         ];

     

       52
       52

+2 -2

pkgs/tools/security/sudo/default.nix

···

       35
       35
        
           "--with-iologdir=/var/log/sudo-io"

     

       36
       36
        
           "--with-sendmail=${sendmailPath}"

     

       37
       37
        
           "--enable-tmpfiles.d=no"

     

       38
       38
       -
         ] ++ lib.optional withInsults [

     

       38
       38
       +
         ] ++ lib.optionals withInsults [

     

       39
       39
        
           "--with-insults"

     

       40
       40
        
           "--with-all-insults"

     

       41
       41
       -
         ] ++ lib.optional withSssd [

     

       41
       41
       +
         ] ++ lib.optionals withSssd [

     

       42
       42
        
           "--with-sssd"

     

       43
       43
        
           "--with-sssd-lib=${sssd}/lib"

     

       44
       44
        
         ];

+1 -2

pkgs/tools/system/chase/default.nix

···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         doCheck = true;

     

       15
       15
       -
         makeFlags = [ "-e" ];

     

       16
       16
       -
         makeFlagsArray="LIBS=-lgc";

     

       15
       15
       +
         makeFlags = [ "-e" "LIBS=-lgc" ];

     

       17
       16
        
       

     

       18
       17
        
         meta = with lib ; {

     

       19
       18
        
           description = "Follow a symlink and print out its target file";

+1 -1

pkgs/tools/system/fio/default.nix

···

       31
       31
        
       

     

       32
       32
        
         pythonPath = [ python3.pkgs.six ];

     

       33
       33
        
       

     

       34
       34
       -
         makeWrapperArgs = lib.optional withGnuplot [

     

       34
       34
       +
         makeWrapperArgs = lib.optionals withGnuplot [

     

       35
       35
        
           "--prefix PATH : ${lib.makeBinPath [ gnuplot ]}"

     

       36
       36
        
         ];

     

       37
       37

+2 -2

pkgs/tools/system/netdata/default.nix

···

       99
       99
        
           "--sysconfdir=/etc"

     

       100
       100
        
           "--disable-ebpf"

     

       101
       101
        
           "--with-jemalloc=${jemalloc}"

     

       102
       102
       -
         ] ++ optional (!withDBengine) [

     

       102
       102
       +
         ] ++ optionals (!withDBengine) [

     

       103
       103
        
           "--disable-dbengine"

     

       104
       104
       -
         ] ++ optional (!withCloud) [

     

       104
       104
       +
         ] ++ optionals (!withCloud) [

     

       105
       105
        
           "--disable-cloud"

     

       106
       106
        
         ];

     

       107
       107

+1 -1

pkgs/tools/system/tre-command/default.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         # this test requires package to be in a git repo to succeed

     

       25
       25
       -
         checkFlags = "--skip respect_git_ignore";

     

       25
       25
       +
         checkFlags = [ "--skip" "respect_git_ignore" ];

     

       26
       26
        
       

     

       27
       27
        
         meta = with lib; {

     

       28
       28
        
           description = "Tree command, improved";

+29 -23

pkgs/top-level/perl-packages.nix

···

       849
       849
        
           };

     

       850
       850
        
           buildInputs = [ PodParser ];

     

       851
       851
        
           propagatedBuildInputs = [ AppPackager FileLoadLines IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ]

     

       852
       852
       -
             ++ lib.optional (!stdenv.isDarwin) [ Wx ];

     

       852
       852
       +
             ++ lib.optionals (!stdenv.isDarwin) [ Wx ];

     

       853
       853
        
           nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;

     

       854
       854
        
           postInstall = lib.optionalString stdenv.isDarwin ''

     

       855
       855
        
             shortenPerlShebang $out/bin/chordpro

     
···

       5288
       5288
        
             hash = "sha256-+OzKRch+uRMlmSsT8FlPgI5vG8TDuafxQbmoODhNJSw=";

     

       5289
       5289
        
           };

     

       5290
       5290
        
       

     

       5291
       5291
       -
           makeMakerFlags = "--libpath=${lib.getLib pkgs.openssl}/lib --incpath=${pkgs.openssl.dev}/include";

     

       5291
       5291
       +
           makeMakerFlags = [ "--libpath=${lib.getLib pkgs.openssl}/lib" "--incpath=${pkgs.openssl.dev}/include" ];

     

       5292
       5292
        
           buildInputs = [ PathClass ];

     

       5293
       5293
        
           propagatedBuildInputs = [ BytesRandomSecure LWPProtocolHttps ];

     

       5294
       5294
        
           meta = {

     
···

       6697
       6697
        
             })

     

       6698
       6698
        
           ];

     

       6699
       6699
        
       

     

       6700
       6700
       -
           makeMakerFlags = "SQLITE_INC=${pkgs.sqlite.dev}/include SQLITE_LIB=${pkgs.sqlite.out}/lib";

     

       6700
       6700
       +
           makeMakerFlags = [ "SQLITE_INC=${pkgs.sqlite.dev}/include" "SQLITE_LIB=${pkgs.sqlite.out}/lib" ];

     

       6701
       6701
        
       

     

       6702
       6702
        
           postInstall = ''

     

       6703
       6703
        
             # Get rid of a pointless copy of the SQLite sources.

     
···

       6786
       6786
        
           buildInputs = [ pkgs.postgresql ];

     

       6787
       6787
        
           propagatedBuildInputs = [ DBI ];

     

       6788
       6788
        
       

     

       6789
       6789
       -
           makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}";

     

       6789
       6789
       +
           makeMakerFlags = [ "POSTGRES_HOME=${pkgs.postgresql}" ];

     

       6790
       6790
        
       

     

       6791
       6791
        
           # tests freeze in a sandbox

     

       6792
       6792
        
           doCheck = false;

     
···

       9310
       9310
        
             hash = "sha256-Uuax3Hyy2HpM30OboUXguejPKMwmpIo8+Zd8g0Y5Z+4=";

     

       9311
       9311
        
           };

     

       9312
       9312
        
           buildInputs = [ pkgs.file ConfigAutoConf TestFatal ];

     

       9313
       9313
       -
           makeMakerFlags = "--lib=${pkgs.file}/lib";

     

       9313
       9313
       +
           makeMakerFlags = [ "--lib=${pkgs.file}/lib" ];

     

       9314
       9314
        
           preCheck = ''

     

       9315
       9315
        
             substituteInPlace t/oo-api.t \

     

       9316
       9316
        
               --replace "/usr/share/file/magic.mgc" "${pkgs.file}/share/misc/magic.mgc"

     
···

       9958
       9958
        
           # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"

     

       9959
       9959
        
           hardeningDisable = [ "format" ];

     

       9960
       9960
        
       

     

       9961
       9961
       -
           makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}";

     

       9961
       9961
       +
           makeMakerFlags = [ "--lib_png_path=${pkgs.libpng.out}" "--lib_jpeg_path=${pkgs.libjpeg.out}" "--lib_zlib_path=${pkgs.zlib.out}" "--lib_ft_path=${pkgs.freetype.out}" "--lib_fontconfig_path=${pkgs.fontconfig.lib}" "--lib_xpm_path=${pkgs.xorg.libXpm.out}" ];

     

       9962
       9962
        
       

     

       9963
       9963
        
           meta = {

     

       9964
       9964
        
             description = "Perl interface to the gd2 graphics library";

     
···

       10017
       10017
        
             url = "mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz";

     

       10018
       10018
        
             hash = "sha256-FjAgMV1cVEGDaseeCKd7Qo8nf9CQvqT6gNpwd7JDaro=";

     

       10019
       10019
        
           };

     

       10020
       10020
       -
           makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include";

     

       10020
       10020
       +
           makeMakerFlags = [ "LIBS=-L${pkgs.geoip}/lib" "INC=-I${pkgs.geoip}/include" ];

     

       10021
       10021
        
           doCheck = false; # seems to access the network

     

       10022
       10022
        
           meta = {

     

       10023
       10023
        
             description = "Look up location and network information by IP Address";

     
···

       10510
       10510
        
             hash = "sha256-fY8se2F2L7TsctLsKBKQ8vh/nH0pgnPaRSVDKmXncNY=";

     

       10511
       10511
        
           };

     

       10512
       10512
        
           propagatedBuildInputs = [ pkgs.krb5Full.dev ];

     

       10513
       10513
       -
           makeMakerFlags = "--gssapiimpl ${pkgs.krb5Full.dev}";

     

       10513
       10513
       +
           makeMakerFlags = [ "--gssapiimpl" "${pkgs.krb5Full.dev}" ];

     

       10514
       10514
        
           meta = {

     

       10515
       10515
        
             description = "Perl extension providing access to the GSSAPIv2 library";

     

       10516
       10516
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     
···

       11783
       11783
        
             hash = "sha256-dNRNcBwfFPxLmE+toelVcmtQTC2LBtJl56hh+llDy0g=";

     

       11784
       11784
        
           };

     

       11785
       11785
        
           buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ];

     

       11786
       11786
       -
           makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib";

     

       11786
       11786
       +
           makeMakerFlags = [ "--incpath ${pkgs.libjpeg.dev}/include" "--libpath ${pkgs.libjpeg.out}/lib" "--incpath" "${pkgs.libpng.dev}/include" "--libpath" "${pkgs.libpng.out}/lib" ];

     

       11787
       11787
        
           meta = {

     

       11788
       11788
        
             description = "Perl extension for Generating 24 bit Images";

     

       11789
       11789
        
             homepage = "http://imager.perl.org";

     
···

       11844
       11844
        
           };

     

       11845
       11845
        
           buildInputs = [ pkgs.libpng pkgs.libjpeg TestNoWarnings ];

     

       11846
       11846
        
           propagatedBuildInputs = [ pkgs.zlib ];

     

       11847
       11847
       -
           makeMakerFlags = "--with-jpeg-includes=${pkgs.libjpeg.dev}/include --with-jpeg-libs=${pkgs.libjpeg.out}/lib --with-png-includes=${pkgs.libpng.dev}/include --with-png-libs=${pkgs.libpng.out}/lib";

     

       11847
       11847
       +
           makeMakerFlags = [ "--with-jpeg-includes=${pkgs.libjpeg.dev}/include" "--with-jpeg-libs=${pkgs.libjpeg.out}/lib" "--with-png-includes=${pkgs.libpng.dev}/include" "--with-png-libs=${pkgs.libpng.out}/lib" ];

     

       11848
       11848
        
           meta = {

     

       11849
       11849
        
             description = "Fast, high-quality fixed-point image resizing";

     

       11850
       11850
        
             license = with lib.licenses; [ gpl2Plus ];

     
···

       12574
       12574
        
           propagatedBuildInputs = [ Inline ];

     

       12575
       12575
        
       

     

       12576
       12576
        
           # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731

     

       12577
       12577
       -
           makeMakerFlags = "J2SDK=${pkgs.jdk8}";

     

       12577
       12577
       +
           makeMakerFlags = [ "J2SDK=${pkgs.jdk8}" ];

     

       12578
       12578
        
       

     

       12579
       12579
        
           # FIXME: Apparently tests want to access the network.

     

       12580
       12580
        
           doCheck = false;

     
···

       12831
       12831
        
           outputs = [ "out" "tex" ];

     

       12832
       12832
        
           propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageMagick ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ];

     

       12833
       12833
        
           nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;

     

       12834
       12834
       -
           makeMakerFlags = "TEXMF=\${tex} NOMKTEXLSR";

     

       12834
       12834
       +
           makeMakerFlags = [ "TEXMF=\${tex}" "NOMKTEXLSR" ];

     

       12835
       12835
        
           # shebangs need to be patched before executables are copied to $out

     

       12836
       12836
        
           preBuild = ''

     

       12837
       12837
        
             patchShebangs bin/

     
···

       12909
       12909
        
           outputs = [ "out" ];

     

       12910
       12910
        
           buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ];

     

       12911
       12911
        
           propagatedBuildInputs = [ (pkgs.apacheHttpdPackages.mod_perl.override { inherit perl; }) ];

     

       12912
       12912
       -
           makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config";

     

       12912
       12912
       +
           makeMakerFlags = [

     

       12913
       12913
       +
             "--with-apache2-src=${pkgs.apacheHttpd.dev}"

     

       12914
       12914
       +
             "--with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs"

     

       12915
       12915
       +
             "--with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd"

     

       12916
       12916
       +
             "--with-apr-config=${pkgs.apr.dev}/bin/apr-1-config"

     

       12917
       12917
       +
             "--with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config"

     

       12918
       12918
       +
           ];

     

       12913
       12919
        
           preConfigure = ''

     

       12914
       12920
        
             # override broken prereq check

     

       12915
       12921
        
             substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\""

     
···

       14573
       14579
        
           #   `overflow'; Pari.o:(.bss+0x80): first defined here

     

       14574
       14580
        
           NIX_CFLAGS_COMPILE = "-fcommon";

     

       14575
       14581
        
           preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz";

     

       14576
       14576
       -
           makeMakerFlags = "pari_tgz=pari-${pariversion}.tgz";

     

       14582
       14582
       +
           makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tgz" ];

     

       14577
       14583
        
           src = fetchurl {

     

       14578
       14584
        
             url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030518.zip";

     

       14579
       14585
        
             hash = "sha256-3DiVWpaQvmuvqN4lJiEjd8Psn+jaXsAiY6nK+UtYu5E=";

     
···

       15739
       15745
        
             hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk=";

     

       15740
       15746
        
           };

     

       15741
       15747
        
       

     

       15742
       15742
       -
           makeMakerFlags = "MP_AP_DESTDIR=$out";

     

       15748
       15748
       +
           makeMakerFlags = [ "MP_AP_DESTDIR=$out" ];

     

       15743
       15749
        
           buildInputs = [ pkgs.apacheHttpd ];

     

       15744
       15750
        
           doCheck = false; # would try to start Apache HTTP server

     

       15745
       15751
        
           passthru.tests = nixosTests.mod_perl;

     
···

       16437
       16443
        
           buildInputs = [ ModuleBuildTiny TestSharedFork pkgs.postgresql ];

     

       16438
       16444
        
           propagatedBuildInputs = [ DBDPg DBI FileWhich FunctionParameters Moo TieHashMethod TryTiny TypeTiny ];

     

       16439
       16445
        
       

     

       16440
       16440
       -
           makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}";

     

       16446
       16446
       +
           makeMakerFlags = [ "POSTGRES_HOME=${pkgs.postgresql}" ];

     

       16441
       16447
        
       

     

       16442
       16448
        
           meta = {

     

       16443
       16449
        
             description = "PostgreSQL runner for tests";

     
···

       17578
       17584
        
             hash = "sha256-hS1u6H6PDQFCIwJlgcu1aSS6jN3TzrKcYZHbthItQ8U=";

     

       17579
       17585
        
           };

     

       17580
       17586
        
           propagatedBuildInputs = [ DigestHMAC ];

     

       17581
       17581
       -
           makeMakerFlags = "--noonline-tests";

     

       17587
       17587
       +
           makeMakerFlags = [ "--noonline-tests" ];

     

       17582
       17588
        
           meta = {

     

       17583
       17589
        
             description = "Perl Interface to the Domain Name System";

     

       17584
       17590
        
             license = with lib.licenses; [ mit ];

     
···

       22734
       22740
        
             pkgs.tk

     

       22735
       22741
        
           ] ++ lib.optionals stdenv.isDarwin [

     

       22736
       22742
        
             darwin.apple_sdk.frameworks.CoreServices ];

     

       22737
       22737
       -
           makeMakerFlags = lib.optionalString stdenv.isLinux

     

       22738
       22738
       -
             "--tclsh=${pkgs.tcl}/bin/tclsh --nousestubs";

     

       22743
       22743
       +
           makeMakerFlags = lib.optionals stdenv.isLinux

     

       22744
       22744
       +
             [ "--tclsh=${pkgs.tcl}/bin/tclsh" "--nousestubs" ];

     

       22739
       22745
        
           meta = {

     

       22740
       22746
        
             description = "Tcl extension module for Perl";

     

       22741
       22747
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     
···

       26156
       26162
        
             url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.035.tar.gz";

     

       26157
       26163
        
             hash = "sha256-TSuAKRum3jTY7IhqCFptvSt5C5JgNaCH6ZAlYUxf/dQ=";

     

       26158
       26164
        
           };

     

       26159
       26159
       -
           makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib";

     

       26165
       26165
       +
           makeMakerFlags = [ "X11INC=${pkgs.xorg.libX11.dev}/include" "X11LIB=${pkgs.xorg.libX11.out}/lib" ];

     

       26160
       26166
        
           buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ];

     

       26161
       26167
        
           doCheck = false;            # Expects working X11.

     

       26162
       26168
        
           meta = {

     
···

       26172
       26178
        
             url = "mirror://cpan/authors/id/A/AS/ASB/Tk-ToolBar-0.12.tar.gz";

     

       26173
       26179
        
             hash = "sha256-Rj4oTsRxN+fEJclpGwKo3sXOJytY6h9jWa6AQaI53Q8=";

     

       26174
       26180
        
           };

     

       26175
       26175
       -
           makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib";

     

       26181
       26181
       +
           makeMakerFlags = [ "X11INC=${pkgs.xorg.libX11.dev}/include" "X11LIB=${pkgs.xorg.libX11.out}/lib" ];

     

       26176
       26182
        
           buildInputs = [ Tk ];

     

       26177
       26183
        
           doCheck = false;            # Expects working X11.

     

       26178
       26184
        
           meta = {

     
···

       27279
       27285
        
           '' + lib.optionalString stdenv.isCygwin ''

     

       27280
       27286
        
             sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm

     

       27281
       27287
        
           '';

     

       27282
       27282
       -
           makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include";

     

       27288
       27288
       +
           makeMakerFlags = [ "EXPATLIBPATH=${pkgs.expat.out}/lib" "EXPATINCPATH=${pkgs.expat.dev}/include" ];

     

       27283
       27289
        
           propagatedBuildInputs = [ LWP ];

     

       27284
       27290
        
           meta = {

     

       27285
       27291
        
             description = "A perl module for parsing XML documents";

     
···

       27806
       27812
        
           NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include -I${pkgs.libidn2}.dev}/include";

     

       27807
       27813
        
           NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2";

     

       27808
       27814
        
       

     

       27809
       27809
       -
           makeMakerFlags = "--prefix-openssl=${pkgs.openssl_1_1.dev}";

     

       27815
       27815
       +
           makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl_1_1.dev}" ];

     

       27810
       27816
        
       

     

       27811
       27817
        
           nativeBuildInputs = [ pkgs.pkg-config ];

     

       27812
       27818
        
           buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 ];