remove un-needed overlays
This commit is contained in:
parent
2c72404533
commit
308330af2c
2 changed files with 14 additions and 39 deletions
|
@ -12,12 +12,6 @@ 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 = [
|
||||||
|
@ -25,15 +19,6 @@ 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;
|
||||||
|
@ -46,22 +31,12 @@ in {
|
||||||
cargoVendorDir = "vendor";
|
cargoVendorDir = "vendor";
|
||||||
});
|
});
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/pull/434998
|
# TODO: Maybe upstream to nixpkgs (ruby maintainer please reply to my DM)
|
||||||
ibus = super.ibus.overrideAttrs (old: {
|
ruby_3_3 = super.ruby_3_3.overrideAttrs (old: {
|
||||||
buildInputs = (old.buildInputs or []) ++ [super.wayland-scanner];
|
NIX_RUSTFLAGS =
|
||||||
|
(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
18
flake.lock
generated
|
@ -1231,11 +1231,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756022458,
|
"lastModified": 1756261190,
|
||||||
"narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
|
"narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
|
"rev": "77f348da3176dc68b20a73dab94852a417daf361",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1500,10 +1500,10 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755959989,
|
"lastModified": 1756487742,
|
||||||
"narHash": "sha256-Spe0L9ImranbPAHLlPpIgDU+5aKWLrzvQsXFz7j6RTQ=",
|
"narHash": "sha256-SaaRHD6NxMTP24yTUHE8ZweEdv02fve271mnMAj5qio=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "424e9b7b029c6d386fee190cbb3ff2750dfa0a90",
|
"rev": "682147283df9a33241afdf55659cab4a79c44a7e",
|
||||||
"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": 1755615617,
|
"lastModified": 1756386758,
|
||||||
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue