Compare commits

..

No commits in common. "308330af2c297596cbfde6f05f36057f4a0f37b4" and "e2217ceb81255fb02c907037f0b1eaa2f50f18ab" have entirely different histories.

3 changed files with 39 additions and 15 deletions

View file

@ -12,6 +12,12 @@ in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(_: super: { (_: super: {
ruby_3_3 = super.ruby_3_3.overrideAttrs (old: {
NIX_RUSTFLAGS =
(old.NIX_RUSTFLAGS or "")
+ " --target ${super.stdenv.hostPlatform.rust.rustcTargetSpec}";
});
# https://github.com/NixOS/nixpkgs/pull/434550 # https://github.com/NixOS/nixpkgs/pull/434550
iniparser = super.iniparser.overrideAttrs (old: { iniparser = super.iniparser.overrideAttrs (old: {
cmakeFlags = [ cmakeFlags = [
@ -19,6 +25,15 @@ in {
]; ];
}); });
# https://github.com/NixOS/nixpkgs/pull/434579
gnome-user-share = super.gnome-user-share.overrideAttrs (old: {
env.CARGO_BUILD_TARGET = super.stdenv.hostPlatform.rust.rustcTargetSpec;
postPatch = ''
substituteInPlace src/meson.build \
--replace-fail "'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@'," "'cp', 'src' / '${super.stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(), '@OUTPUT@',"
'';
});
# TODO: Upstream to nixpkgs # TODO: Upstream to nixpkgs
glycin-loaders = super.glycin-loaders.overrideAttrs (old: { glycin-loaders = super.glycin-loaders.overrideAttrs (old: {
env.CARGO_BUILD_TARGET = super.stdenv.hostPlatform.rust.rustcTargetSpec; env.CARGO_BUILD_TARGET = super.stdenv.hostPlatform.rust.rustcTargetSpec;
@ -31,12 +46,22 @@ in {
cargoVendorDir = "vendor"; cargoVendorDir = "vendor";
}); });
# TODO: Maybe upstream to nixpkgs (ruby maintainer please reply to my DM) # https://github.com/NixOS/nixpkgs/pull/434998
ruby_3_3 = super.ruby_3_3.overrideAttrs (old: { ibus = super.ibus.overrideAttrs (old: {
NIX_RUSTFLAGS = buildInputs = (old.buildInputs or []) ++ [super.wayland-scanner];
(old.NIX_RUSTFLAGS or "")
+ " --target ${super.stdenv.hostPlatform.rust.rustcTargetSpec}";
}); });
# https://github.com/NixOS/nixpkgs/pull/431159
gst_all_1 =
super.gst_all_1
// {
gst-editing-services = super.gst_all_1.gst-editing-services.overrideAttrs (old: {
mesonFlags = [
(lib.mesonEnable "doc" false)
(lib.mesonEnable "tests" false)
];
});
};
}) })
]; ];
} }

18
flake.lock generated
View file

@ -1231,11 +1231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756261190, "lastModified": 1756022458,
"narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "77f348da3176dc68b20a73dab94852a417daf361", "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1500,10 +1500,10 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756487742, "lastModified": 1755959989,
"narHash": "sha256-SaaRHD6NxMTP24yTUHE8ZweEdv02fve271mnMAj5qio=", "narHash": "sha256-Spe0L9ImranbPAHLlPpIgDU+5aKWLrzvQsXFz7j6RTQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "682147283df9a33241afdf55659cab4a79c44a7e", "rev": "424e9b7b029c6d386fee190cbb3ff2750dfa0a90",
"revCount": 49, "revCount": 49,
"type": "git", "type": "git",
"url": "https://git.federated.nexus/Henry-Hiles/matrixoidc" "url": "https://git.federated.nexus/Henry-Hiles/matrixoidc"
@ -2368,11 +2368,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1756386758, "lastModified": 1755615617,
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", "rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -21,7 +21,6 @@
esbenp.prettier-vscode esbenp.prettier-vscode
oderwat.indent-rainbow oderwat.indent-rainbow
astro-build.astro-vscode astro-build.astro-vscode
tamasfe.even-better-toml
pkief.material-icon-theme pkief.material-icon-theme
streetsidesoftware.code-spell-checker streetsidesoftware.code-spell-checker
arcticicestudio.nord-visual-studio-code arcticicestudio.nord-visual-studio-code