Fix the static build (#1534)

* openssl linking fix is required after all

* remove Cabal override (obsoleted on new nixpkgs)
This commit is contained in:
Remo Rechkemmer
2020-05-21 14:47:07 -05:00
committed by GitHub
parent 48c9ac36b1
commit 3a1844ec8e
8 changed files with 78 additions and 120 deletions
+2 -14
View File
@@ -1,10 +1,7 @@
{ compiler, static ? false }:
{ compiler, extraOverrides ? (final: prev: { }) }:
self: super:
let
lib =
self.haskell.lib;
overrides =
final: prev:
rec {
@@ -15,16 +12,7 @@ let
ver = "0.3.0";
sha256 = "0iwh4wsjhb7pms88lw1afhdal9f86nrrkkvv65f9wxbd1b159n72";
} { };
cabal2nix =
if static then
# cabal2nix depends on Cabal 3.0.*, while our pinned version of
# Nixpkgs only provides 2.4 or 3.2. So we pinned 3.0.0.0 in
# ./Cabal.nix
prev.cabal2nix.overrideScope (self: super: { Cabal = self.callPackage ./Cabal.nix { }; })
else
prev.cabal2nix;
};
} // extraOverrides final prev;
in
{
haskell =