From cb2a3c76a7e84663c97fab6a12c35576f1be7a10 Mon Sep 17 00:00:00 2001
From: Arnaud Bailly <arnaud.bailly@iohk.io>
Date: Fri, 20 Oct 2023 09:10:37 +0200
Subject: [PATCH] Fix static and docker builds

---
 .github/workflows/static_binary.yaml | 6 ++++--
 nix/hydra/project.nix                | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/static_binary.yaml b/.github/workflows/static_binary.yaml
index e4a864add41..1fb9c6990ee 100644
--- a/.github/workflows/static_binary.yaml
+++ b/.github/workflows/static_binary.yaml
@@ -3,8 +3,10 @@ name: Static executable
 
 on:
   push:
-    branches: [ "master" ]
-    tags: [ "*.*.*" ]
+    branches:
+    - "**"
+    tags:
+    - "*.*.*"
 
 jobs:
   build-executables:
diff --git a/nix/hydra/project.nix b/nix/hydra/project.nix
index 33f973c03ad..c33c91fb862 100644
--- a/nix/hydra/project.nix
+++ b/nix/hydra/project.nix
@@ -72,6 +72,13 @@ let
         # XXX: Could not figure out where to make this flag ^^^ effective in the haddock build
         packages.strict-containers.doHaddock = false;
       }
+      ({ lib, config, ... }:
+        lib.mkIf (lib.versionAtLeast config.compiler.version "9.4") {
+          # lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries
+          # to call out to all kinds of silly tools that GHC doesn't really provide.
+          # For this reason, we try to get away without re-installing lib:ghc for now.
+          reinstallableLibGhc = false;
+        })
     ];
   };
 in