max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-12 17:26:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more issues

Browse source
This commit is contained in:
John Ericson 2024-06-27 19:30:58 -04:00
parent 479befa76d
commit 17c843c5c5
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package.nix
View file

@ -207,10 +207,7 @@ in {
libsodium libsodium
openssl openssl
sqlite sqlite
(toml11.overrideAttrs (old: { toml11
# TODO change in Nixpkgs, Windows works fine.
meta.platforms = lib.platforms.all;
}))
xz xz
({ inherit readline editline; }.${readlineFlavor}) ({ inherit readline editline; }.${readlineFlavor})
] ++ lib.optionals enableMarkdown [ ] ++ lib.optionals enableMarkdown [

13
packaging/dependencies.nix
View file

@ -10,6 +10,7 @@
stdenv, stdenv,
versionSuffix, versionSuffix,
}: }:
let let
inherit (pkgs) lib; inherit (pkgs) lib;
@ -52,7 +53,7 @@ scope: {
enableLargeConfig = true; 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 { boost = (pkgs.boost.override {
extraB2Args = [ extraB2Args = [
"--with-container" "--with-container"
@ -61,8 +62,8 @@ scope: {
]; ];
}).overrideAttrs (old: { }).overrideAttrs (old: {
# Need to remove `--with-*` to use `--with-libraries=...` # Need to remove `--with-*` to use `--with-libraries=...`
buildPhase = pkgs.lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase; buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase;
installPhase = pkgs.lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase; installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
}); });
libgit2 = pkgs.libgit2.overrideAttrs (attrs: { 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); mkMesonDerivation = f: stdenv.mkDerivation (lib.extends localSourceLayer f);
} }