diff --git a/clients/quadphone/binfmt.nix b/clients/quadphone/binfmt.nix new file mode 100644 index 0000000..fa9ce26 --- /dev/null +++ b/clients/quadphone/binfmt.nix @@ -0,0 +1,2 @@ +{inputs, ...}: { +} diff --git a/clients/quadphone/overlays.nix b/clients/quadphone/overlays.nix index e26ef06..0d5e137 100644 --- a/clients/quadphone/overlays.nix +++ b/clients/quadphone/overlays.nix @@ -1,4 +1,15 @@ -{lib, ...}: { +{ + lib, + inputs, + ... +}: let + ibusPath = "i18n/input-method/default.nix"; +in { + disabledModules = [ibusPath]; + imports = [ + (import "${inputs.ibus-fix}/nixos/modules/${ibusPath}") + ]; + nixpkgs.overlays = [ (_: super: { ruby_3_3 = super.ruby_3_3.overrideAttrs (old: { @@ -6,18 +17,51 @@ (old.NIX_RUSTFLAGS or "") + " --target ${super.stdenv.hostPlatform.rust.rustcTargetSpec}"; }); + + # https://github.com/NixOS/nixpkgs/pull/434550 iniparser = super.iniparser.overrideAttrs (old: { cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" false) ]; }); + + # https://github.com/NixOS/nixpkgs/pull/434579 gnome-user-share = super.gnome-user-share.overrideAttrs (old: { - postPatch = lib.optionalString (super.stdenv.buildPlatform != super.stdenv.hostPlatform) '' + env.CARGO_BUILD_TARGET = super.stdenv.hostPlatform.rust.rustcTargetSpec; + postPatch = '' substituteInPlace src/meson.build \ - --replace-fail "cargo_options += [ '--target-dir', meson.project_build_root() / 'src' ]" "cargo_options += [ '--target-dir', meson.project_build_root() / 'src', '--target=${super.stdenv.hostPlatform.rust.rustcTarget}' ]" \ --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; + postPatch = '' + substituteInPlace loaders/meson.build \ + --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${super.stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader," + ''; + + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [super.buildPackages.rustPlatform.cargoSetupHook]; + cargoVendorDir = "vendor"; + }); + + # https://github.com/NixOS/nixpkgs/pull/434998 + ibus = super.ibus.overrideAttrs (old: { + buildInputs = (old.buildInputs or []) ++ [super.wayland-scanner]; + }); + + # 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) + ]; + }); + }; }) ]; } diff --git a/flake.lock b/flake.lock index 4d818f8..7a27e04 100644 --- a/flake.lock +++ b/flake.lock @@ -545,11 +545,11 @@ ] }, "locked": { - "lastModified": 1754971456, - "narHash": "sha256-p04ZnIBGzerSyiY2dNGmookCldhldWAu03y0s3P8CB0=", + "lastModified": 1755519972, + "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=", "owner": "nix-community", "repo": "disko", - "rev": "8246829f2e675a46919718f9a64b71afe3bfb22d", + "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d", "type": "github" }, "original": { @@ -1054,22 +1054,6 @@ "type": "github" } }, - "fontsCross": { - "locked": { - "lastModified": 1755477642, - "narHash": "sha256-sNX3Yl+9c5oFrbHiHHLFMdTei99s5DkYRHflxvlYRDQ=", - "owner": "Artturin", - "repo": "nixpkgs", - "rev": "371eef69fe2afce2175b8bd8a44e1daad99cefa2", - "type": "github" - }, - "original": { - "owner": "Artturin", - "ref": "fontscross", - "repo": "nixpkgs", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -1247,11 +1231,11 @@ ] }, "locked": { - "lastModified": 1755121891, - "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=", + "lastModified": 1755625756, + "narHash": "sha256-t57ayMEdV9g1aCfHzoQjHj1Fh3LDeyblceADm2hsLHM=", "owner": "nix-community", "repo": "home-manager", - "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426", + "rev": "dd026d86420781e84d0732f2fa28e1c051117b59", "type": "github" }, "original": { @@ -1281,6 +1265,22 @@ "type": "github" } }, + "ibus-fix": { + "locked": { + "lastModified": 1755615982, + "narHash": "sha256-x+vQv6K/A70KbLa+xB4wmu2X1eVa4FJ2Y3auQ3Ef41U=", + "owner": "Artturin", + "repo": "nixpkgs", + "rev": "28555291142cfb7f19e3fcf086f2ef0e54a167c6", + "type": "github" + }, + "original": { + "owner": "Artturin", + "ref": "i18inputmethodcross", + "repo": "nixpkgs", + "type": "github" + } + }, "kukui-nixos": { "inputs": { "conf2nix": [ @@ -1500,11 +1500,11 @@ ] }, "locked": { - "lastModified": 1754079836, - "narHash": "sha256-rmQEN0RvK7c5XaHkP+wILuMICiO50AlMu4vzTzz7wZY=", + "lastModified": 1755540870, + "narHash": "sha256-kxuS+KAIfAT4s5NbtouCzfAN7c5FbNFkx2AgyP47eBQ=", "ref": "refs/heads/main", - "rev": "ff95c709614c07e9a549f29ba1c4fcb77fb8fdc5", - "revCount": 47, + "rev": "a48c2fcd42b1133a5163eb283f6f307f0148fbdc", + "revCount": 48, "type": "git", "url": "https://git.federated.nexus/Henry-Hiles/matrixoidc" }, @@ -1695,11 +1695,11 @@ ] }, "locked": { - "lastModified": 1754265716, - "narHash": "sha256-2qNrXplb0+aDtrAxdf1IRo3SfJpP+Q54eSDckSimRDE=", + "lastModified": 1755643339, + "narHash": "sha256-29L6J2K+I/1fhUN6ZnJYaXFONljXQdTdj1yXyRTpK7M=", "ref": "refs/heads/main", - "rev": "7131e4ed66f56faa7fb3325cd6a8c9fe38946675", - "revCount": 18, + "rev": "403953df933d70f69d1f8aab5dc050665ad8d963", + "revCount": 19, "type": "git", "url": "https://git.federated.nexus/federated-nexus/nexusbot" }, @@ -2368,11 +2368,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -2645,10 +2645,10 @@ "disko": "disko", "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts", - "fontsCross": "fontsCross", "gnome-mobile": "gnome-mobile", "grapevine": "grapevine", "home-manager": "home-manager_2", + "ibus-fix": "ibus-fix", "lasuite-docs-proxy": "lasuite-docs-proxy", "matrixoidc": "matrixoidc", "nexusbot": "nexusbot", @@ -2886,11 +2886,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755211397, - "narHash": "sha256-kw6iLWUj6+fiEpuc8ntrIzJ2gdS36wIcRINbKU0AIbA=", + "lastModified": 1755636375, + "narHash": "sha256-HQQ7LdyHWCUcRBeGLTwJm+tJ8hmuglSzP/ZLeNBjFkk=", "owner": "danth", "repo": "stylix", - "rev": "928ca832d22ab3167b49dc5f4d52ff5d26b0b52a", + "rev": "2567b924669c566d132ce4cafd4bc0a119846b52", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bb9fbde..144a6c2 100755 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,11 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; wrapper-manager.url = "github:viperML/wrapper-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; + ibus-fix.url = "github:Artturin/nixpkgs/i18inputmethodcross"; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - fontsCross.url = "github:Artturin/nixpkgs/fontscross"; run0-sudo-shim = { url = "github:lordgrimmauld/run0-sudo-shim"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/graphical/librewolf/default.nix b/modules/graphical/librewolf/default.nix index 7b15e71..0884baf 100644 --- a/modules/graphical/librewolf/default.nix +++ b/modules/graphical/librewolf/default.nix @@ -124,6 +124,7 @@ "historyblock@kain" "uBlock0@raymondhill.net" "sponsorBlocker@ajay.app" + "firefox-addon@pronoundb.org" "jid1-MnnxcxisBPnSXQ@jetpack" # Privacy Badger "frankerfacez@frankerfacez.com" "7esoorv3@alefvanoon.anonaddy.me" # LibRedirect