feat(nix): use baseline x86 packages for desktop apps
treefmt / nix fmt (pull_request) Successful in 4s
build_systems / prebuild-common-x86-64-v3 (pull_request) Successful in 21s
build_systems / build-portal-1 (pull_request) Successful in 17s
test ebook search / test-ebook-search (pull_request) Successful in 1m7s
build_systems / build-bob (pull_request) Successful in 46s
build_systems / build-brain (pull_request) Successful in 49s
build_systems / build-jeeves (pull_request) Successful in 1m16s
build_systems / build-rhapsody-in-green (pull_request) Canceled after 2h25m27s
treefmt / nix fmt (pull_request) Successful in 4s
build_systems / prebuild-common-x86-64-v3 (pull_request) Successful in 21s
build_systems / build-portal-1 (pull_request) Successful in 17s
test ebook search / test-ebook-search (pull_request) Successful in 1m7s
build_systems / build-bob (pull_request) Successful in 46s
build_systems / build-brain (pull_request) Successful in 49s
build_systems / build-jeeves (pull_request) Successful in 1m16s
build_systems / build-rhapsody-in-green (pull_request) Canceled after 2h25m27s
This commit is contained in:
+11
-2
@@ -1,13 +1,13 @@
|
|||||||
{ inputs, ... }:
|
{ inputs, ... }:
|
||||||
{
|
{
|
||||||
# When applied, the stable nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.stable'
|
# Additional package sets are accessible through `pkgs.<name>`.
|
||||||
stable = final: _prev: {
|
stable = final: _prev: {
|
||||||
stable = import inputs.nixpkgs-stable {
|
stable = import inputs.nixpkgs-stable {
|
||||||
system = final.stdenv.hostPlatform.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# When applied, the master nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.master'
|
|
||||||
master = final: _prev: {
|
master = final: _prev: {
|
||||||
master = import inputs.nixpkgs-master {
|
master = import inputs.nixpkgs-master {
|
||||||
system = final.stdenv.hostPlatform.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
@@ -15,5 +15,14 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Baseline x86-64 (v1) packages for prebuilt applications that should not
|
||||||
|
# inherit an x86-64-v3 host platform.
|
||||||
|
x86-v1 = final: _prev: {
|
||||||
|
x86-v1 = import inputs.nixpkgs {
|
||||||
|
system = final.stdenv.hostPlatform.system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
patches = import ./patches;
|
patches = import ./patches;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs.x86-v1; [
|
||||||
discord-canary
|
discord-canary
|
||||||
signal-desktop
|
signal-desktop
|
||||||
slack
|
slack
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
gimp
|
gimp
|
||||||
mediainfo
|
mediainfo
|
||||||
obs-studio
|
obs-studio
|
||||||
obsidian
|
x86-v1.obsidian
|
||||||
prismlauncher
|
prismlauncher
|
||||||
prusa-slicer
|
prusa-slicer
|
||||||
qalculate-gtk
|
qalculate-gtk
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ in
|
|||||||
|
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscode;
|
package = pkgs.x86-v1.vscode;
|
||||||
mutableExtensionsDir = true;
|
mutableExtensionsDir = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user