mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-09 15:58:05 +02:00
Fix more issues
This commit is contained in:
parent
479befa76d
commit
17c843c5c5
2 changed files with 11 additions and 7 deletions
|
@ -207,10 +207,7 @@ in {
|
|||
libsodium
|
||||
openssl
|
||||
sqlite
|
||||
(toml11.overrideAttrs (old: {
|
||||
# TODO change in Nixpkgs, Windows works fine.
|
||||
meta.platforms = lib.platforms.all;
|
||||
}))
|
||||
toml11
|
||||
xz
|
||||
({ inherit readline editline; }.${readlineFlavor})
|
||||
] ++ lib.optionals enableMarkdown [
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
stdenv,
|
||||
versionSuffix,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
|
||||
|
@ -52,7 +53,7 @@ scope: {
|
|||
enableLargeConfig = true;
|
||||
};
|
||||
|
||||
# Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed.
|
||||
# TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed.
|
||||
boost = (pkgs.boost.override {
|
||||
extraB2Args = [
|
||||
"--with-container"
|
||||
|
@ -61,8 +62,8 @@ scope: {
|
|||
];
|
||||
}).overrideAttrs (old: {
|
||||
# Need to remove `--with-*` to use `--with-libraries=...`
|
||||
buildPhase = pkgs.lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase;
|
||||
installPhase = pkgs.lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
|
||||
buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase;
|
||||
installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
|
||||
});
|
||||
|
||||
libgit2 = pkgs.libgit2.overrideAttrs (attrs: {
|
||||
|
@ -96,5 +97,11 @@ scope: {
|
|||
'';
|
||||
});
|
||||
|
||||
# TODO change in Nixpkgs, Windows works fine. First commit of
|
||||
# https://github.com/NixOS/nixpkgs/pull/322977 backported will fix.
|
||||
toml11 = pkgs.toml11.overrideAttrs (old: {
|
||||
meta.platforms = lib.platforms.all;
|
||||
});
|
||||
|
||||
mkMesonDerivation = f: stdenv.mkDerivation (lib.extends localSourceLayer f);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue