NorfairKing/feedback
1
1
Fork 0
mirror of https://github.com/NorfairKing/feedback.git synced 2024-11-25 19:32:42 +03:00
Code Issues Projects Releases Wiki Activity

remove the static build

Browse Source
This commit is contained in:
Tom Sydney Kerckhove 2024-11-14 10:54:54 +01:00
parent 4d96c92167
commit 71042ec295
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -53,20 +53,13 @@
];
};
pkgs = pkgsFor nixpkgs;
muslPkgs = pkgs.pkgsMusl;
in
{
overlays.${system} = import ./nix/overlay.nix;
packages.${system} = {
default = self.packages.${system}.dynamic;
dynamic = pkgs.feedback;
static = muslPkgs.feedback;
};
packages.${system}.default = pkgs.feedback;
checks.${system} = {
release = self.packages.${system}.default;
static = self.packages.${system}.static;
dynamic = self.packages.${system}.dynamic;
shell = self.devShells.${system}.default;
coverage-report = pkgs.dekking.makeCoverageReport {
name = "test-coverage-report";

28
nix/overlay.nix
View File

@ -14,25 +14,7 @@ with final.haskell.lib;
haskellPackages = prev.haskellPackages.override (old: {
overrides = composeExtensions (old.overrides or (_: _: { })) (
self: super:
let
fixGHC = pkg:
if final.stdenv.hostPlatform.isMusl
then
pkg.override
{
# To make sure that executables that need template
# haskell can be linked statically.
enableRelocatedStaticLibs = true;
enableShared = false;
enableDwarf = false;
}
else pkg;
in
{
ghc = fixGHC super.ghc;
buildHaskellPackages = old.buildHaskellPackages.override (oldBuildHaskellPackages: {
ghc = fixGHC oldBuildHaskellPackages.ghc;
});
feedback = self.generateOptparseApplicativeCompletions [ "feedback" ] (
buildFromSdist (overrideCabal (self.callPackage ../feedback { })
(old: {
@ -58,17 +40,7 @@ with final.haskell.lib;
"--ghc-options=-Wcpp-undef"
"--ghc-options=-Werror"
"--ghc-options=-optP-Wno-nonportable-include-path" # For macos
] ++ optionals final.stdenv.hostPlatform.isMusl [
"--ghc-option=-static"
"--ghc-option=-optl=-static"
# Static
"--extra-lib-dirs=${final.gmp6.override { withStatic = true; }}/lib"
"--extra-lib-dirs=${final.libffi.overrideAttrs (old: { dontDisableStatic = true; })}/lib"
# for -ltinfo
"--extra-lib-dirs=${(final.ncurses.override { enableStatic = true; })}/lib"
];
enableSharedExecutables = !final.stdenv.hostPlatform.isMusl;
enableSharedLibraries = !final.stdenv.hostPlatform.isMusl;
})));
feedback-test-harness = buildStrictly
(overrideCabal (self.callPackage ../feedback-test-harness { }) (old: {