Henry-Hiles/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove un-needed overlays

Browse source
This commit is contained in:
Henry Hiles 2025-08-29 13:43:06 -04:00
commit 308330af2c
No known key found for this signature in database
2 changed files with 14 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

35
clients/quadphone/overlays.nix
View file

@ -12,12 +12,6 @@ in {
nixpkgs.overlays = [
(_: 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
iniparser = super.iniparser.overrideAttrs (old: {
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
glycin-loaders = super.glycin-loaders.overrideAttrs (old: {
env.CARGO_BUILD_TARGET = super.stdenv.hostPlatform.rust.rustcTargetSpec;
@ -46,22 +31,12 @@ in {
cargoVendorDir = "vendor";
});
# https://github.com/NixOS/nixpkgs/pull/434998
ibus = super.ibus.overrideAttrs (old: {
buildInputs = (old.buildInputs or []) ++ [super.wayland-scanner];
# TODO: Maybe upstream to nixpkgs (ruby maintainer please reply to my DM)
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/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": {
"lastModified": 1756022458,
"narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
"lastModified": 1756261190,
"narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
"rev": "77f348da3176dc68b20a73dab94852a417daf361",
"type": "github"
},
"original": {
@ -1500,10 +1500,10 @@
]
},
"locked": {
"lastModified": 1755959989,
"narHash": "sha256-Spe0L9ImranbPAHLlPpIgDU+5aKWLrzvQsXFz7j6RTQ=",
"lastModified": 1756487742,
"narHash": "sha256-SaaRHD6NxMTP24yTUHE8ZweEdv02fve271mnMAj5qio=",
"ref": "refs/heads/main",
"rev": "424e9b7b029c6d386fee190cbb3ff2750dfa0a90",
"rev": "682147283df9a33241afdf55659cab4a79c44a7e",
"revCount": 49,
"type": "git",
"url": "https://git.federated.nexus/Henry-Hiles/matrixoidc"
@ -2368,11 +2368,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1755615617,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"lastModified": 1756386758,
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
"type": "github"
},
"original": {