mirror of
https://github.com/NorfairKing/feedback.git
synced 2024-11-25 19:32:42 +03:00
remove the static build
This commit is contained in:
parent
4d96c92167
commit
71042ec295
@ -53,20 +53,13 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
pkgs = pkgsFor nixpkgs;
|
pkgs = pkgsFor nixpkgs;
|
||||||
muslPkgs = pkgs.pkgsMusl;
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
overlays.${system} = import ./nix/overlay.nix;
|
overlays.${system} = import ./nix/overlay.nix;
|
||||||
packages.${system} = {
|
packages.${system}.default = pkgs.feedback;
|
||||||
default = self.packages.${system}.dynamic;
|
|
||||||
dynamic = pkgs.feedback;
|
|
||||||
static = muslPkgs.feedback;
|
|
||||||
};
|
|
||||||
checks.${system} = {
|
checks.${system} = {
|
||||||
release = self.packages.${system}.default;
|
release = self.packages.${system}.default;
|
||||||
static = self.packages.${system}.static;
|
|
||||||
dynamic = self.packages.${system}.dynamic;
|
|
||||||
shell = self.devShells.${system}.default;
|
shell = self.devShells.${system}.default;
|
||||||
coverage-report = pkgs.dekking.makeCoverageReport {
|
coverage-report = pkgs.dekking.makeCoverageReport {
|
||||||
name = "test-coverage-report";
|
name = "test-coverage-report";
|
||||||
|
@ -14,25 +14,7 @@ with final.haskell.lib;
|
|||||||
haskellPackages = prev.haskellPackages.override (old: {
|
haskellPackages = prev.haskellPackages.override (old: {
|
||||||
overrides = composeExtensions (old.overrides or (_: _: { })) (
|
overrides = composeExtensions (old.overrides or (_: _: { })) (
|
||||||
self: super:
|
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" ] (
|
feedback = self.generateOptparseApplicativeCompletions [ "feedback" ] (
|
||||||
buildFromSdist (overrideCabal (self.callPackage ../feedback { })
|
buildFromSdist (overrideCabal (self.callPackage ../feedback { })
|
||||||
(old: {
|
(old: {
|
||||||
@ -58,17 +40,7 @@ with final.haskell.lib;
|
|||||||
"--ghc-options=-Wcpp-undef"
|
"--ghc-options=-Wcpp-undef"
|
||||||
"--ghc-options=-Werror"
|
"--ghc-options=-Werror"
|
||||||
"--ghc-options=-optP-Wno-nonportable-include-path" # For macos
|
"--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
|
feedback-test-harness = buildStrictly
|
||||||
(overrideCabal (self.callPackage ../feedback-test-harness { }) (old: {
|
(overrideCabal (self.callPackage ../feedback-test-harness { }) (old: {
|
||||||
|
Loading…
Reference in New Issue
Block a user