commit 4a6916aba3ec57667d5e5582e84bbd1613e1a056 · pyrox.dev/nixpkgs

+1 -1

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

···

       35
       35
        
       , rebuildBytecode ? true

     

       36
       36
        
       , stripBytecode ? false

     

       37
       37
        
       , includeSiteCustomize ? true

     

       38
       38
       -
       , static ? false

     

       38
       38
       +
       , static ? stdenv.hostPlatform.isStatic

     

       39
       39
        
       # Not using optimizations on Darwin

     

       40
       40
        
       # configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.

     

       41
       41
        
       , enableOptimizations ? (!stdenv.isDarwin)

+6 -3

pkgs/development/libraries/cdo/default.nix

···

       1
       1
        
       { stdenv, fetchurl, curl, hdf5, netcdf

     

       2
       2
       -
       , enable_cdi_lib ? false    # build, install and link to a CDI library [default=no]

     

       3
       3
       -
       , enable_all_static ? false # build a completely statically linked CDO binary  [default=no]

     

       4
       4
       -
       , enable_cxx ? false        # Use CXX as default compiler [default=no]

     

       2
       2
       +
       , # build, install and link to a CDI library [default=no]

     

       3
       3
       +
         enable_cdi_lib ? false

     

       4
       4
       +
       , # build a completely statically linked CDO binary

     

       5
       5
       +
         enable_all_static ? stdenv.hostPlatform.isStatic

     

       6
       6
       +
       , # Use CXX as default compiler [default=no]

     

       7
       7
       +
         enable_cxx ? false

     

       5
       8
        
       }:

     

       6
       9
        
       

     

       7
       10
        
       stdenv.mkDerivation rec {

+2 -1

pkgs/development/libraries/crc32c/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, cmake, gflags

     

       2
       2
       -
       , staticOnly ? false }:

     

       2
       2
       +
       , staticOnly ? stdenv.hostPlatform.isStatic

     

       3
       3
       +
       }:

     

       3
       4
        
       

     

       4
       5
        
       stdenv.mkDerivation rec {

     

       5
       6
        
         pname = "crc32c";

+2 -1

pkgs/development/libraries/gsm/default.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
       -
       , staticSupport ? false # Compile statically (support for packages that look for the static object)

     

       2
       2
       +
       , # Compile statically (support for packages that look for the static object)

     

       3
       3
       +
         staticSupport ? stdenv.hostPlatform.isStatic

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       5
       6
        
       let

+4 -1

pkgs/development/libraries/libev/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, static ? false }:

     

       1
       1
       +
       { stdenv, fetchurl

     

       2
       2
       +
       , # Note: -static hasn’t work on darwin

     

       3
       3
       +
         static ? with stdenv.hostPlatform; isStatic && !isDarwin

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       6
        
       # Note: this package is used for bootstrapping fetchurl, and thus

     

       4
       7
        
       # cannot use fetchpatch! All mutable patches (generated by GitHub or

+3 -1

pkgs/development/libraries/libressl/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, lib, cmake, cacert, fetchpatch, buildShared ? true }:

     

       1
       1
       +
       { stdenv, fetchurl, lib, cmake, cacert, fetchpatch

     

       2
       2
       +
       , buildShared ? !stdenv.hostPlatform.isStatic

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       let

     

       4
       6

+1 -1

pkgs/development/libraries/nghttp2/default.nix

···

       8
       8
        
       , enableAsioLib ? false, boost ? null

     

       9
       9
        
       , enableGetAssets ? false, libxml2 ? null

     

       10
       10
        
       , enableJemalloc ? false, jemalloc ? null

     

       11
       11
       -
       , enableApp ? !stdenv.hostPlatform.isWindows

     

       11
       11
       +
       , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic

     

       12
       12
        
       , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null

     

       13
       13
        
       }:

     

       14
       14

+3 -1

pkgs/development/libraries/snappy/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, static ? false }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake

     

       2
       2
       +
       , static ? stdenv.hostPlatform.isStatic

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       stdenv.mkDerivation rec {

     

       4
       6
        
         pname = "snappy";

+3 -1

pkgs/development/web/woff2/default.nix

···

       1
       1
       -
       { brotli, cmake, pkgconfig, fetchFromGitHub, stdenv, static ? false }:

     

       1
       1
       +
       { brotli, cmake, pkgconfig, fetchFromGitHub, stdenv

     

       2
       2
       +
       , static ? stdenv.hostPlatform.isStatic

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       stdenv.mkDerivation rec {

     

       4
       6
        
         pname = "woff2";

+2 -1

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

···

       1
       1
        
       { stdenv, lib, fetchurl, autoreconfHook, pkgconfig

     

       2
       2
        
       , libxslt, xz, elf-header

     

       3
       3
       -
       , withStatic ? false }:

     

       3
       3
       +
       , withStatic ? stdenv.hostPlatform.isStatic

     

       4
       4
       +
       }:

     

       4
       5
        
       

     

       5
       6
        
       let

     

       6
       7
        
         systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];

+24 -9

pkgs/servers/x11/xorg/overrides.nix

···

       74
       74
        
         mkfontdir = self.mkfontscale;

     

       75
       75
        
       

     

       76
       76
        
         libxcb = super.libxcb.overrideAttrs (attrs: {

     

       77
       77
       -
           configureFlags = [ "--enable-xkb" "--enable-xinput" ];

     

       77
       77
       +
           configureFlags = [ "--enable-xkb" "--enable-xinput" ]

     

       78
       78
       +
             ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared";

     

       78
       79
        
           outputs = [ "out" "dev" "man" "doc" ];

     

       79
       80
        
         });

     

       80
       81
        
       

     
···

       82
       83
        
           outputs = [ "out" "dev" "man" ];

     

       83
       84
        
           configureFlags = attrs.configureFlags or []

     

       84
       85
        
             ++ malloc0ReturnsNullCrossFlag;

     

       85
       85
       -
           depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       86
       86
       +
           depsBuildBuild = [

     

       87
       87
       +
             buildPackages.stdenv.cc

     

       88
       88
       +
           ] ++ stdenv.lib.optionals stdenv.hostPlatform.isStatic [

     

       89
       89
       +
             (self.buildPackages.stdenv.cc.libc.static or null)

     

       90
       90
       +
           ];

     

       86
       91
        
           preConfigure = ''

     

       87
       92
        
             sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure

     

       88
       93
        
           '';

     

       89
       89
       -
           postInstall =

     

       90
       90
       -
             ''

     

       91
       91
       -
               # Remove useless DocBook XML files.

     

       92
       92
       -
               rm -rf $out/share/doc

     

       93
       93
       -
             '';

     

       94
       94
       +
           postInstall = ''

     

       95
       95
       +
             # Remove useless DocBook XML files.

     

       96
       96
       +
             rm -rf $out/share/doc

     

       97
       97
       +
           '';

     

       94
       98
        
           CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";

     

       95
       99
        
           propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ];

     

       96
       100
        
         });

     
···

       138
       142
        
         xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {

     

       139
       143
        
           configureFlags = attrs.configureFlags or []

     

       140
       144
        
             ++ malloc0ReturnsNullCrossFlag;

     

       145
       145
       +
           preConfigure = attrs.preConfigure or ""

     

       146
       146
       +
           # missing transitive dependencies

     

       147
       147
       +
           + stdenv.lib.optionalString stdenv.hostPlatform.isStatic ''

     

       148
       148
       +
             export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp"

     

       149
       149
       +
           '';

     

       141
       150
        
         });

     

       142
       151
        
       

     

       143
       152
        
         # Propagate some build inputs because of header file dependencies.

     
···

       223
       232
        
         libXi = super.libXi.overrideAttrs (attrs: {

     

       224
       233
        
           outputs = [ "out" "dev" "man" "doc" ];

     

       225
       234
        
           propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ];

     

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

     

       227
       227
       -
             "xorg_cv_malloc0_returns_null=no";

     

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

     

       236
       236
       +
             "xorg_cv_malloc0_returns_null=no"

     

       237
       237
       +
           ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared";

     

       228
       238
        
         });

     

       229
       239
        
       

     

       230
       240
        
         libXinerama = super.libXinerama.overrideAttrs (attrs: {

     
···

       745
       755
        
       

     

       746
       756
        
         xauth = super.xauth.overrideAttrs (attrs: {

     

       747
       757
        
           doCheck = false; # fails

     

       758
       758
       +
           preConfigure = attrs.preConfigure or ""

     

       759
       759
       +
           # missing transitive dependencies

     

       760
       760
       +
           + stdenv.lib.optionalString stdenv.hostPlatform.isStatic ''

     

       761
       761
       +
             export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp"

     

       762
       762
       +
           '';

     

       748
       763
        
         });

     

       749
       764
        
       

     

       750
       765
        
         xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {

+3 -1

pkgs/tools/compression/brotli/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, fetchpatch

     

       2
       2
       +
       , staticOnly ? stdenv.hostPlatform.isStatic

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       # ?TODO: there's also python lib in there

     

       4
       6

+1 -1

pkgs/tools/compression/zstd/default.nix

···

       2
       2
        
       , fixDarwinDylibNames

     

       3
       3
        
       , file

     

       4
       4
        
       , legacySupport ? false

     

       5
       5
       -
       , static ? false

     

       5
       5
       +
       , static ? stdenv.hostPlatform.isStatic

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

+3 -1

pkgs/tools/filesystems/e2fsprogs/default.nix

···

       1
       1
       -
       { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, shared ? true }:

     

       1
       1
       +
       { stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo

     

       2
       2
       +
       , shared ? !stdenv.hostPlatform.isStatic

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       stdenv.mkDerivation rec {

     

       4
       6
        
         pname = "e2fsprogs";

+4 -1

pkgs/tools/graphics/gifsicle/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, xorgproto, libXt, libX11, gifview ? false, static ? false }:

     

       1
       1
       +
       { stdenv, fetchurl, xorgproto, libXt, libX11

     

       2
       2
       +
       , gifview ? false

     

       3
       3
       +
       , static ? stdenv.hostPlatform.isStatic

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       6
        
       with stdenv.lib;

     

       4
       7

+2 -1

pkgs/tools/networking/curl/default.nix

···

       7
       7
        
       , gnutlsSupport ? false, gnutls ? null

     

       8
       8
        
       , wolfsslSupport ? false, wolfssl ? null

     

       9
       9
        
       , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null

     

       10
       10
       -
       , gssSupport ? !stdenv.hostPlatform.isWindows, libkrb5 ? null

     

       10
       10
       +
       , # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039

     

       11
       11
       +
         gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5 ? null

     

       11
       12
        
       , c-aresSupport ? false, c-ares ? null

     

       12
       13
        
       , brotliSupport ? false, brotli ? null

     

       13
       14
        
       }:

-80

pkgs/top-level/static.nix

···

       108
       108
        
             haskellStaticAdapter;

     

       109
       109
        
         };

     

       110
       110
        
       

     

       111
       111
       -
         nghttp2 = super.nghttp2.override {

     

       112
       112
       -
           enableApp = false;

     

       113
       113
       -
         };

     

       114
       114
       -
       

     

       115
       111
        
         zlib = super.zlib.override {

     

       116
       112
        
           # Don’t use new stdenv zlib because

     

       117
       113
        
           # it doesn’t like the --disable-shared flag

     

       118
       114
        
           stdenv = super.stdenv;

     

       119
       115
        
         };

     

       120
       120
       -
         gifsicle = super.gifsicle.override {

     

       121
       121
       -
           static = true;

     

       122
       122
       -
         };

     

       123
       116
        
         openssl = super.openssl_1_1.overrideAttrs (o: {

     

       124
       117
        
           # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags.

     

       125
       118
        
           configureFlags = (removeUnknownConfigureFlags o.configureFlags);

     
···

       129
       122
        
           # --disable-shared flag

     

       130
       123
        
           stdenv = super.stdenv;

     

       131
       124
        
         };

     

       132
       132
       -
         cdo = super.cdo.override {

     

       133
       133
       -
           enable_all_static = true;

     

       134
       134
       -
         };

     

       135
       135
       -
         gsm = super.gsm.override {

     

       136
       136
       -
           staticSupport = true;

     

       137
       137
       -
         };

     

       138
       138
       -
         crc32c = super.crc32c.override {

     

       139
       139
       -
           staticOnly = true;

     

       140
       140
       -
         };

     

       141
       125
        
         perl = super.perl.override {

     

       142
       126
        
           # Don’t use new stdenv zlib because

     

       143
       127
        
           # it doesn’t like the --disable-shared flag

     

       144
       128
        
           stdenv = super.stdenv;

     

       145
       129
        
         };

     

       146
       146
       -
         woff2 = super.woff2.override {

     

       147
       147
       -
           static = true;

     

       148
       148
       -
         };

     

       149
       149
       -
         snappy = super.snappy.override {

     

       150
       150
       -
           static = true;

     

       151
       151
       -
         };

     

       152
       152
       -
         libressl = super.libressl.override {

     

       153
       153
       -
           buildShared = false;

     

       154
       154
       -
         };

     

       155
       155
       -
       

     

       156
       156
       -
         kmod = super.kmod.override {

     

       157
       157
       -
           withStatic = true;

     

       158
       158
       -
         };

     

       159
       159
       -
       

     

       160
       160
       -
         curl = super.curl.override {

     

       161
       161
       -
           # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039

     

       162
       162
       -
           gssSupport = false;

     

       163
       163
       -
         };

     

       164
       164
       -
       

     

       165
       165
       -
         e2fsprogs = super.e2fsprogs.override {

     

       166
       166
       -
           shared = false;

     

       167
       167
       -
         };

     

       168
       168
       -
       

     

       169
       169
       -
         brotli = super.brotli.override {

     

       170
       170
       -
           staticOnly = true;

     

       171
       171
       -
         };

     

       172
       172
       -
       

     

       173
       173
       -
         zstd = super.zstd.override {

     

       174
       174
       -
           static = true;

     

       175
       175
       -
         };

     

       176
       130
        
       

     

       177
       131
        
         ocaml-ng = self.lib.mapAttrs (_: set:

     

       178
       132
        
           if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set

     

       179
       133
        
         ) super.ocaml-ng;

     

       180
       180
       -
       

     

       181
       181
       -
         python27 = super.python27.override { static = true; };

     

       182
       182
       -
         python36 = super.python36.override { static = true; };

     

       183
       183
       -
         python37 = super.python37.override { static = true; };

     

       184
       184
       -
         python38 = super.python38.override { static = true; };

     

       185
       185
       -
         python39 = super.python39.override { static = true; };

     

       186
       186
       -
         python3Minimal = super.python3Minimal.override { static = true; };

     

       187
       187
       -
       

     

       188
       188
       -
         # Note: -static doesn’t work on darwin

     

       189
       189
       -
         libev = super.libev.override { static = !super.stdenv.hostPlatform.isDarwin; };

     

       190
       190
       -
       

     

       191
       191
       -
         xorg = super.xorg.overrideScope' (xorgself: xorgsuper: {

     

       192
       192
       -
           libX11 = xorgsuper.libX11.overrideAttrs (attrs: {

     

       193
       193
       -
             depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ];

     

       194
       194
       -
           });

     

       195
       195
       -
           xauth = xorgsuper.xauth.overrideAttrs (attrs: {

     

       196
       196
       -
             # missing transitive dependencies

     

       197
       197
       -
             preConfigure = attrs.preConfigure or "" + ''

     

       198
       198
       -
               export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp"

     

       199
       199
       -
             '';

     

       200
       200
       -
           });

     

       201
       201
       -
           xdpyinfo = xorgsuper.xdpyinfo.overrideAttrs (attrs: {

     

       202
       202
       -
             # missing transitive dependencies

     

       203
       203
       -
             preConfigure = attrs.preConfigure or "" + ''

     

       204
       204
       -
               export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp"

     

       205
       205
       -
             '';

     

       206
       206
       -
           });

     

       207
       207
       -
           libxcb = xorgsuper.libxcb.overrideAttrs (attrs: {

     

       208
       208
       -
             configureFlags = attrs.configureFlags ++ [ "--disable-shared" ];

     

       209
       209
       -
           });

     

       210
       210
       -
           libXi= xorgsuper.libXi.overrideAttrs (attrs: {

     

       211
       211
       -
             configureFlags = attrs.configureFlags ++ [ "--disable-shared" ];

     

       212
       212
       -
           });

     

       213
       213
       -
         });

     

       214
       134
        
       }