diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-03 21:40:14 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-03 21:46:14 +0000 |
commit | 5c2965145f322386d45db04c409fd2f8a3c3b478 (patch) | |
tree | 67c42ad4baaf5a9f52e8623310a3e381b2004cb8 /pkgs/top-level/static.nix | |
parent | 9c9c6461ba79a6c233741760045f3b44be5924dd (diff) | |
download | nixpkgs-5c2965145f322386d45db04c409fd2f8a3c3b478.tar nixpkgs-5c2965145f322386d45db04c409fd2f8a3c3b478.tar.gz nixpkgs-5c2965145f322386d45db04c409fd2f8a3c3b478.tar.bz2 nixpkgs-5c2965145f322386d45db04c409fd2f8a3c3b478.tar.lz nixpkgs-5c2965145f322386d45db04c409fd2f8a3c3b478.tar.xz nixpkgs-5c2965145f322386d45db04c409fd2f8a3c3b478.tar.zst nixpkgs-5c2965145f322386d45db04c409fd2f8a3c3b478.zip |
treewide: Inline more of the static overlay
Picking up where #107238 left off. I think I'll have gotten all the easy stuff with this.
Diffstat (limited to 'pkgs/top-level/static.nix')
-rw-r--r-- | pkgs/top-level/static.nix | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index f1d3ea2a159..48e4618762a 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -108,18 +108,11 @@ in { haskellStaticAdapter; }; - nghttp2 = super.nghttp2.override { - enableApp = false; - }; - zlib = super.zlib.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - gifsicle = super.gifsicle.override { - static = true; - }; openssl = super.openssl_1_1.overrideAttrs (o: { # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. configureFlags = (removeUnknownConfigureFlags o.configureFlags); @@ -129,86 +122,13 @@ in { # --disable-shared flag stdenv = super.stdenv; }; - cdo = super.cdo.override { - enable_all_static = true; - }; - gsm = super.gsm.override { - staticSupport = true; - }; - crc32c = super.crc32c.override { - staticOnly = true; - }; perl = super.perl.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - woff2 = super.woff2.override { - static = true; - }; - snappy = super.snappy.override { - static = true; - }; - libressl = super.libressl.override { - buildShared = false; - }; - - kmod = super.kmod.override { - withStatic = true; - }; - - curl = super.curl.override { - # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 - gssSupport = false; - }; - - e2fsprogs = super.e2fsprogs.override { - shared = false; - }; - - brotli = super.brotli.override { - staticOnly = true; - }; - - zstd = super.zstd.override { - static = true; - }; ocaml-ng = self.lib.mapAttrs (_: set: if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - - python27 = super.python27.override { static = true; }; - python36 = super.python36.override { static = true; }; - python37 = super.python37.override { static = true; }; - python38 = super.python38.override { static = true; }; - python39 = super.python39.override { static = true; }; - python3Minimal = super.python3Minimal.override { static = true; }; - - # Note: -static doesn’t work on darwin - libev = super.libev.override { static = !super.stdenv.hostPlatform.isDarwin; }; - - xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { - libX11 = xorgsuper.libX11.overrideAttrs (attrs: { - depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ]; - }); - xauth = xorgsuper.xauth.overrideAttrs (attrs: { - # missing transitive dependencies - preConfigure = attrs.preConfigure or "" + '' - export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" - ''; - }); - xdpyinfo = xorgsuper.xdpyinfo.overrideAttrs (attrs: { - # missing transitive dependencies - preConfigure = attrs.preConfigure or "" + '' - export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" - ''; - }); - libxcb = xorgsuper.libxcb.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; - }); - libXi= xorgsuper.libXi.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; - }); - }); } |