Drop static linking
This commit is contained in:
parent
16dd05e8f0
commit
d73bb0a676
22
flake.nix
22
flake.nix
|
@ -41,27 +41,7 @@
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages = forEachSupportedSystem ({ pkgs, cranePkgs, ... }: rec {
|
packages = forEachSupportedSystem ({ pkgs, cranePkgs, ... }: rec {
|
||||||
magic-nix-cache = (pkgs.pkgsStatic.callPackage ./package.nix {
|
magic-nix-cache = pkgs.callPackage ./package.nix { };
|
||||||
rustPlatform = pkgs.pkgsStatic.rustPackages_1_70.rustPlatform;
|
|
||||||
nix = pkgs.pkgsStatic.nix.overrideAttrs (old: {
|
|
||||||
patches = (old.patches or []) ++ [ ./nix.patch ];
|
|
||||||
});
|
|
||||||
}).overrideAttrs (old: {
|
|
||||||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
|
|
||||||
pkgs.nukeReferences
|
|
||||||
];
|
|
||||||
|
|
||||||
# Read by pkg_config crate (do some autodetection in build.rs?)
|
|
||||||
PKG_CONFIG_ALL_STATIC = "1";
|
|
||||||
|
|
||||||
"NIX_CFLAGS_LINK_${pkgs.pkgsStatic.stdenv.cc.suffixSalt}" = "-lc";
|
|
||||||
RUSTFLAGS = "-C relocation-model=static";
|
|
||||||
|
|
||||||
postFixup = (old.postFixup or "") + ''
|
|
||||||
rm -f $out/nix-support/propagated-build-inputs
|
|
||||||
nuke-refs $out/bin/magic-nix-cache
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
#inherit (cranePkgs) magic-nix-cache;
|
#inherit (cranePkgs) magic-nix-cache;
|
||||||
default = magic-nix-cache;
|
default = magic-nix-cache;
|
||||||
});
|
});
|
||||||
|
|
|
@ -38,4 +38,8 @@ in rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
# Recursive Nix is not stable yet
|
# Recursive Nix is not stable yet
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
rm -f $out/nix-support/propagated-build-inputs
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue