Building?

This commit is contained in:
Andrea Ciceri 2021-10-14 10:35:16 +02:00
parent 9237779561
commit 741d9b5b6a
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
6 changed files with 36 additions and 58 deletions

View file

@ -1,4 +1,3 @@
name: "Check & Build (with Cachix)"
on:
push:
@ -12,7 +11,7 @@ jobs:
- uses: cachix/install-nix-action@v13
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/8d8xah1f6ypccpmw9cfsl8ziw1chj4cl/install
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
extra_nix_config: >
experimental-features = nix-command flakes
system-features = nixos-test benchmark big-parallel kvm recursive-nix
@ -33,8 +32,8 @@ jobs:
- uses: cachix/cachix-action@v10
with:
name: aciceri-fleet
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: sed -i 's/#\(.*checks.aarch64.*\)/\1/g' flake.nix # disabling aarch64 outputs
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: sed 's/#\(.*\)/\1/g' flake.nix # disabling outputs unsupported inside the GitHub action
- run: nix -Lv flake check
- run: nix -Lv build ".#nixosConfigurations.pc.config.system.build.toplevel"
- run: nix -Lv develop -c echo OK

View file

@ -182,9 +182,11 @@
}
// {
budModules = { devos = import ./bud; };
# checks.aarch64-linux = { }; # this line will be uncommented by Github Action in order since it can't build aarch64 derivations
}
// {
# checks.aarch64-linux = { }; # ga-uncomment
# checks.x86_64-darwin = { }; # ga-uncomment
# packages.x86_64-darwin = { }; # ga-uncomment
darwinConfigurations."mbp" = darwin.lib.darwinSystem {
system = "x86_64-darwin";
modules = [ home.darwinModules.home-manager ./hosts/mbp ];

View file

@ -2,7 +2,5 @@ final: prev: {
# keep sources this first
sources = prev.callPackage (import ./_sources/generated.nix) { };
customEmacs = prev.callPackage (import ./emacs) { };
ungoogled-chromium = import ./ungoogled-chromium { inherit prev; };
vscodium = import ./vscodium { inherit prev; };
# then, call packages with `final.callPackage`
}

View file

@ -1,10 +0,0 @@
{ prev, ... }:
prev.runCommandNoCC "wrap-chromium"
{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
''
makeWrapper ${prev.pkgs.chromium}/bin/chromium $out/bin/chromium \
--add-flags "--enable-features=UseOzonePlatform" \
--add-flags "--ozone-platform=wayland"
ln -sf ${prev.pkgs.chromium}/share $out/share
''

View file

@ -1,10 +0,0 @@
{ prev, ... }:
prev.runCommandNoCC "codium"
{ buildInputs = with prev.pkgs; [ makeWrapper ]; }
''
makeWrapper ${prev.pkgs.vscodium}/bin/codium $out/bin/codium \
--add-flags "--enable-features=UseOzonePlatform" \
--add-flags "--ozone-platform=wayland"
ln -sf ${prev.pkgs.vscodium}/share $out/share
''

View file

@ -12,7 +12,6 @@
};
home.packages = with pkgs; [
python-language-server
python
fd
ag
@ -29,5 +28,5 @@
mimeType = "x-scheme-handler/org-protocol";
}
)
];
] ++ (if pkgs.system == "x86_64-linux" then [ python-language-server ] else [ ]);
}