Skip to content

Commit

Permalink
Merge pull request IntersectMBO#54 from input-output-hk/rvl/fix-nix-b…
Browse files Browse the repository at this point in the history
…uild

nix: Update package names
  • Loading branch information
KtorZ authored Aug 17, 2020
2 parents 3748764 + 8a7b620 commit 2e2636a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let

self = {
inherit haskellPackages;
inherit (haskellPackages.cardano-addresses.components.exes) cardano-address;
inherit (haskellPackages.cardano-addresses-cli.components.exes) cardano-address;

# `tests` are the test suites which have been built.
#tests = collectComponents' "tests" haskellPackages;
Expand Down
8 changes: 5 additions & 3 deletions nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
let

src = haskell-nix.haskellLib.cleanGit {
name = "cardano-node-src";
name = "cardano-addresses-src";
src = ../.;
};

Expand Down Expand Up @@ -48,8 +48,10 @@ let
# "stm" "terminfo"
];
}
# TODO: Compile all local packages with -Werror:
{ packages.cardano-addresses.configureFlags = [ "--ghc-option=-Werror" ]; }
{
packages.cardano-addresses.configureFlags = [ "--ghc-option=-Werror" ];
packages.cardano-addresses-cli.configureFlags = [ "--ghc-option=-Werror" ];
}
# Musl libc fully static build
(lib.optionalAttrs stdenv.hostPlatform.isMusl (let
# Module options which adds GHC flags and libraries for a fully static build
Expand Down

0 comments on commit 2e2636a

Please sign in to comment.