diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-07-26 09:31:24 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-07-26 09:31:24 +0200 |
commit | 5bd8316b6e115b5261369e9aa0e88a78a13cc950 (patch) | |
tree | 93e41d0e6986e180e144fbe9f09d82e99d28a69c /pkgs/top-level/static.nix | |
parent | f6633932bd93cedbe8f4bd96d3d84fd6ddc960aa (diff) | |
parent | 80ba806339c78bda689c75b1156e56470eb146d2 (diff) | |
download | nixpkgs-5bd8316b6e115b5261369e9aa0e88a78a13cc950.tar nixpkgs-5bd8316b6e115b5261369e9aa0e88a78a13cc950.tar.gz nixpkgs-5bd8316b6e115b5261369e9aa0e88a78a13cc950.tar.bz2 nixpkgs-5bd8316b6e115b5261369e9aa0e88a78a13cc950.tar.lz nixpkgs-5bd8316b6e115b5261369e9aa0e88a78a13cc950.tar.xz nixpkgs-5bd8316b6e115b5261369e9aa0e88a78a13cc950.tar.zst nixpkgs-5bd8316b6e115b5261369e9aa0e88a78a13cc950.zip |
Merge #91975: Misc static cross fixes (into staging)
Diffstat (limited to 'pkgs/top-level/static.nix')
-rw-r--r-- | pkgs/top-level/static.nix | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index b4c1ee9ab3d..2d7f0883ca2 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -216,6 +216,10 @@ in { libressl = super.libressl.override { buildShared = false; }; + libjpeg_turbo = super.libjpeg_turbo.override { + enableStatic = true; + enableShared = false; + }; darwin = super.darwin // { libiconv = super.darwin.libiconv.override { @@ -276,4 +280,28 @@ in { libev = super.libev.override { static = true; }; libexecinfo = super.libexecinfo.override { enableShared = false; }; + + 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" ]; + }); + }); } |