Build with neoidiosyn flake
This commit is contained in:
parent
deb6dc6a26
commit
655d9bc378
2 changed files with 147 additions and 19 deletions
110
flake.lock
110
flake.lock
|
@ -1,5 +1,99 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flakey-profile": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1712898590,
|
||||||
|
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
|
||||||
|
"owner": "lf-",
|
||||||
|
"repo": "flakey-profile",
|
||||||
|
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lf-",
|
||||||
|
"repo": "flakey-profile",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lix": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1732056932,
|
||||||
|
"narHash": "sha256-3ubtSu0D+BUV5FKmBU7kTEXlI/okp/j1xC/ODC7LgTA=",
|
||||||
|
"rev": "b0d7a816135de1cd551b8a54f5497148bf59d81d",
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b0d7a816135de1cd551b8a54f5497148bf59d81d.tar.gz?rev=b0d7a816135de1cd551b8a54f5497148bf59d81d"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lix-module": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"flakey-profile": "flakey-profile",
|
||||||
|
"lix": [
|
||||||
|
"neoidiosyn",
|
||||||
|
"lix"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"neoidiosyn",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731967274,
|
||||||
|
"narHash": "sha256-n6dPGRlMGdL8X5gviA6ZuRfUdbdD5KiNN/BpABA5YT0=",
|
||||||
|
"rev": "aa2846680fa9a2032939d720487942567fd9eb63",
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/aa2846680fa9a2032939d720487942567fd9eb63.tar.gz?rev=aa2846680fa9a2032939d720487942567fd9eb63"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"neoidiosyn": {
|
||||||
|
"inputs": {
|
||||||
|
"lix": "lix",
|
||||||
|
"lix-module": "lix-module",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1732147659,
|
||||||
|
"narHash": "sha256-Ve3i5l5n3UN4bknorr+z5zCYTORXMh1ClUY73e1PQaw=",
|
||||||
|
"ref": "refs/heads/main",
|
||||||
|
"rev": "46e37147704799a97a86d9bcd6014ab83f32a145",
|
||||||
|
"revCount": 1,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://woof.rip/mikael/neoidiosyn.git"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://woof.rip/mikael/neoidiosyn.git"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731531548,
|
"lastModified": 1731531548,
|
||||||
|
@ -18,8 +112,24 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"neoidiosyn": "neoidiosyn",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
56
flake.nix
56
flake.nix
|
@ -3,6 +3,10 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
|
neoidiosyn = {
|
||||||
|
url = "git+https://woof.rip/mikael/neoidiosyn.git";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
|
@ -11,12 +15,10 @@
|
||||||
extra-trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];
|
extra-trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, ... }: let
|
outputs = { self, nixpkgs, neoidiosyn, ... }: let
|
||||||
inherit (nixpkgs) lib;
|
inherit (nixpkgs) lib;
|
||||||
in {
|
in {
|
||||||
packages = lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let
|
packages = lib.mapAttrs (system: pkgs: let
|
||||||
pkgs = nixpkgs.legacyPackages.${system}.pkgsMusl;
|
|
||||||
mimalloc = pkgs.mimalloc.override { secureBuild = true; };
|
|
||||||
extraWrapper = prevAttrs: {
|
extraWrapper = prevAttrs: {
|
||||||
buildCommand = prevAttrs.buildCommand + ''
|
buildCommand = prevAttrs.buildCommand + ''
|
||||||
sed -i \
|
sed -i \
|
||||||
|
@ -26,6 +28,26 @@
|
||||||
"$out/bin/${prevAttrs.meta.mainProgram}"
|
"$out/bin/${prevAttrs.meta.mainProgram}"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
wrapFirefox = pkgs.wrapFirefox.override {
|
||||||
|
ffmpeg = pkgs.ffmpeg.override {
|
||||||
|
ffmpegVariant = "headless";
|
||||||
|
|
||||||
|
withAlsa = false;
|
||||||
|
withAom = false;
|
||||||
|
withCodec2 = true;
|
||||||
|
withDrm = false;
|
||||||
|
withGnutls = false;
|
||||||
|
withSsh = false;
|
||||||
|
withV4l2 = false;
|
||||||
|
|
||||||
|
withNetwork = false;
|
||||||
|
withBin = false;
|
||||||
|
withLib = true;
|
||||||
|
withDocumentation = false;
|
||||||
|
withStripping = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
default = self.packages.${system}.firefox;
|
default = self.packages.${system}.firefox;
|
||||||
firefox = (pkgs.wrapFirefox self.packages.${system}.firefox-unwrapped {
|
firefox = (pkgs.wrapFirefox self.packages.${system}.firefox-unwrapped {
|
||||||
|
@ -34,20 +56,14 @@
|
||||||
|
|
||||||
firefox-unwrapped = ((pkgs.buildMozillaMach {
|
firefox-unwrapped = ((pkgs.buildMozillaMach {
|
||||||
pname = "firefox";
|
pname = "firefox";
|
||||||
|
|
||||||
inherit (pkgs.firefox-beta-unwrapped)
|
inherit (pkgs.firefox-beta-unwrapped)
|
||||||
src version meta tests;
|
src version meta tests;
|
||||||
|
|
||||||
extraConfigureFlags = [
|
extraConfigureFlags = [ "--enable-default-toolkit=cairo-gtk3-wayland-only" ];
|
||||||
"--enable-default-toolkit=cairo-gtk3-wayland-only"
|
}).overrideAttrs {
|
||||||
];
|
autoVarInit = "zero";
|
||||||
|
boundsCheck = true;
|
||||||
extraBuildInputs = [ mimalloc ];
|
}).override {
|
||||||
}).overrideAttrs (prevAttrs: {
|
|
||||||
env = prevAttrs.env or { } // {
|
|
||||||
LDFLAGS = lib.toList prevAttrs.env.LDFLAGS or [ ] ++ [ "-lmimalloc" ] |> toString;
|
|
||||||
};
|
|
||||||
})).override {
|
|
||||||
alsaSupport = false;
|
alsaSupport = false;
|
||||||
ffmpegSupport = true;
|
ffmpegSupport = true;
|
||||||
gssSupport = false;
|
gssSupport = false;
|
||||||
|
@ -67,9 +83,11 @@
|
||||||
thunderbird = (pkgs.wrapThunderbird self.packages.${system}.thunderbird-unwrapped { }).overrideAttrs extraWrapper;
|
thunderbird = (pkgs.wrapThunderbird self.packages.${system}.thunderbird-unwrapped { }).overrideAttrs extraWrapper;
|
||||||
|
|
||||||
thunderbird-unwrapped = (pkgs.thunderbird-latest-unwrapped.overrideAttrs (prevAttrs: {
|
thunderbird-unwrapped = (pkgs.thunderbird-latest-unwrapped.overrideAttrs (prevAttrs: {
|
||||||
configureFlags = prevAttrs.configureFlags or [ ] ++ [
|
autoVarInit = "zero";
|
||||||
"--enable-default-toolkit=cairo-gtk3-wayland-only"
|
boundsCheck = true;
|
||||||
];
|
|
||||||
|
configureFlags = prevAttrs.configureFlags or [ ]
|
||||||
|
++ [ "--enable-default-toolkit=cairo-gtk3-wayland-only" ];
|
||||||
})).override {
|
})).override {
|
||||||
alsaSupport = false;
|
alsaSupport = false;
|
||||||
ffmpegSupport = false;
|
ffmpegSupport = false;
|
||||||
|
@ -86,7 +104,7 @@
|
||||||
privacySupport = true;
|
privacySupport = true;
|
||||||
drmSupport = false;
|
drmSupport = false;
|
||||||
};
|
};
|
||||||
});
|
}) neoidiosyn.legacyPackages;
|
||||||
|
|
||||||
hydraJobs = self.packages |> lib.foldlAttrs (jobs: system: packages: lib.recursiveUpdate jobs
|
hydraJobs = self.packages |> lib.foldlAttrs (jobs: system: packages: lib.recursiveUpdate jobs
|
||||||
(lib.mapAttrs (name: package: { ${system} = package; }) packages)) { };
|
(lib.mapAttrs (name: package: { ${system} = package; }) packages)) { };
|
||||||
|
|
Loading…
Reference in a new issue