Skip to content
Snippets Groups Projects
Commit bbe38d31 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Fix the `zlib` C library dependency in the Nix build

parent 4a54cd33
No related branches found
No related tags found
1 merge request!1Simplistic implementation of download
Pipeline #4467 failed
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
compilerVersion = ghcVersion; compilerVersion = ghcVersion;
packageName = "gbs-downloader"; packageName = "gbs-downloader";
hsPkgsOverrides = import ./nix/haskell-packages.nix { hsPkgsOverrides = import ./nix/haskell-packages.nix {
inherit pkgs;
haskellLib = pkgs.haskell.lib; haskellLib = pkgs.haskell.lib;
}; };
}; };
......
{haskellLib}: hfinal: hprev: { {
pkgs,
haskellLib,
}: hfinal: hprev: {
tahoe-chk = hfinal.callPackage ./tahoe-chk.nix {}; tahoe-chk = hfinal.callPackage ./tahoe-chk.nix {};
tahoe-great-black-swamp = hfinal.callPackage ./tahoe-great-black-swamp.nix {}; tahoe-great-black-swamp = hfinal.callPackage ./tahoe-great-black-swamp.nix {};
# A broken dependency of a tahoe-great-black-swamp executable that we don't # A broken dependency of a tahoe-great-black-swamp executable that we don't
# use. Flip the broken bit so we can get a build. # use. Flip the broken bit so we can get a build.
language-ecmascript = haskellLib.unmarkBroken hprev.language-ecmascript; language-ecmascript = haskellLib.unmarkBroken hprev.language-ecmascript;
# hs-flake-utils does a callCabal2nix for us but we can't use it because we
# need to overide an argument. This overlay runs before the hs-flake-utils
# overlay (a mistake?) so we can't even use hprev.gbs-downloader.override -
# we just have to re-do it all ourselves.
gbs-downloader = hfinal.callCabal2nix "gbs-downloader" ../. {
# cabal2nix gives the generated nix expression a `zlib` parameter which is
# then satisfied *from the Haskell package set* because there is a zlib
# package there and it gets precedence over the zlib in the top-level
# package set. Then the build fails because that's not the zlib we want.
inherit (pkgs) zlib;
};
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment