Skip to content

Commit 21e8b69

Browse files
sgillespiekderme
authored andcommitted
Fix Hydra CI failures
This fixes the following static build errors resulting from updating nixpkgs: (.text.use_builtin_flow+0x10): undefined reference to `pg_fe_cleanup_oauth_flow' collect2: error: ld returned 1 exit status This works by removing curl support for postgresql and enabling static libraries for liburing and snappy
1 parent 6ce64db commit 21e8b69

1 file changed

Lines changed: 21 additions & 0 deletions

File tree

flake.nix

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
libpq =
9595
final.lib.pipe prev.libpq [
9696
(p: p.override {
97+
curlSupport = false;
9798
gssSupport = false;
9899
})
99100

@@ -108,6 +109,26 @@
108109
postInstall = "";
109110
}))
110111
];
112+
113+
liburing = prev.liburing.overrideAttrs (old:
114+
final.lib.optionalAttrs final.stdenv.hostPlatform.isMusl {
115+
dontDisableStatic = true;
116+
# The nixpkgs postInstall script will remove static libs, but we
117+
# need it for musl builds, while keeping the rest intact.
118+
postInstall = ''
119+
# Copy the examples into $bin. Most reverse dependency of
120+
# this package should reference only the $out output
121+
for file in $(find ./examples -executable -type f); do
122+
install -Dm555 -t "$bin/bin" "$file"
123+
done
124+
'';
125+
});
126+
127+
snappy =
128+
prev.snappy.override
129+
(final.lib.optionalAttrs final.stdenv.hostPlatform.isMusl {
130+
static = true;
131+
});
111132
})
112133
];
113134
};

0 commit comments

Comments
 (0)