Skip to content

Commit 20b502e

Browse files
committed
Remove references to snap-server in backend
1 parent 2f61acc commit 20b502e

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

default.nix

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ in rec {
210210

211211
serverExe = backend: frontend: assets: optimizationLevel: externjs: version:
212212
let
213-
exeBackend = if profiling then backend else haskellLib.justStaticExecutables backend;
213+
exeBackend = lib.getBin backend;
214214
exeFrontend = compressedJs frontend optimizationLevel externjs;
215215
exeFrontendAssets = mkAssets exeFrontend;
216216
exeAssets = mkAssets assets;
@@ -293,7 +293,20 @@ in rec {
293293
combinedPackages = self.predefinedPackages // self.userSettings.packages // self.shellPackages;
294294
projectOverrides = self': super': {
295295
${self.staticName} = haskellLib.dontHaddock (self'.callCabal2nix self.staticName self.processedStatic.haskellManifest {});
296-
${self.backendName} = haskellLib.addBuildDepend super'.${self.backendName} self'.obelisk-run;
296+
${self.backendName} = lib.pipe super'.${self.backendName} [
297+
(haskellLib.compose.addBuildDepend self'.obelisk-run)
298+
haskellLib.enableSeparateBinOutput
299+
(haskellLib.compose.overrideCabal
300+
(old: {
301+
# Newer nixpkgs version make sure that static executables don’t pull in GHC via their closure.
302+
# This remove-references-to fixes that for normal obelisk backends.
303+
postInstall = ''
304+
${old.postInstall or ""}
305+
${lib.getExe pkgs.removeReferencesTo} -t ${obelisk.snap-server} "$bin/bin/backend"
306+
'';
307+
})
308+
)
309+
];
297310
};
298311
totalOverrides = lib.composeExtensions self.projectOverrides self.userSettings.overrides;
299312
privateConfigDirs = ["config/backend"];

0 commit comments

Comments
 (0)