This repository was archived by the owner on Sep 27, 2024. It is now read-only.
File tree 2 files changed +15
-5
lines changed
2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change
1
+ result
2
+ result- *
3
+ * .img
4
+ * .qcow2
Original file line number Diff line number Diff line change 68
68
inherit ( pkgs ) system ;
69
69
inherit pkgs device ;
70
70
71
- configuration = { config , lib , ... } : {
71
+ configuration = { config , lib , pkgs , ... } : {
72
72
imports = builtins . attrValues nixosModules ;
73
73
74
74
config = lib . mkMerge [
75
75
( lib . mkIf ( device == "pine64-pinephone" ) {
76
76
services . cage . environment . LIBGL_ALWAYS_SOFTWARE = "1" ;
77
77
} )
78
+ ( lib . mkIf ( pkgs . targetPlatform . isx86_64 && ! pkgs . buildPlatform . isx86_64 ) {
79
+ environment . stub-ld . enable = lib . mkForce false ;
80
+ } )
78
81
{
79
82
services . genesis-shell . enable = true ;
80
83
system . stateVersion = lib . version ;
81
84
}
82
85
] ;
83
86
} ;
84
87
} ;
88
+
89
+ aarch64-multiplatform = if pkgs . hostPlatform . isAarch64 then pkgs else pkgs . pkgsCross . aarch64-multiplatform ;
90
+ gnu64 = if pkgs . hostPlatform . isx86_64 then pkgs else pkgs . pkgsCross . gnu64 ;
85
91
in {
86
- pine64-pinephone = mkMobileSystem "pine64-pinephone" ( if pkgs . hostPlatform . isAarch64 then pkgs else pkgs . pkgsCross . aarch64-multiplatform ) ;
87
- llvm-pine64-pinephone = mkMobileSystem "pine64-pinephone" ( if pkgs . hostPlatform . isAarch64 then pkgs else pkgs . pkgsCross . aarch64-multiplatform ) . pkgsLLVM ;
92
+ pine64-pinephone = mkMobileSystem "pine64-pinephone" aarch64-multiplatform ;
93
+ llvm-pine64-pinephone = mkMobileSystem "pine64-pinephone" aarch64-multiplatform . pkgsLLVM ;
88
94
89
- uefi-x86_64 = mkMobileSystem "uefi-x86_64" ( if pkgs . hostPlatform . isx86_64 then pkgs else pkgs . pkgsCross . gnu64 ) ;
90
- llvm-uefi-x86_64 = mkMobileSystem "uefi-x86_64" ( if pkgs . hostPlatform . isx86_64 then pkgs else pkgs . pkgsCross . gnu64 ) . pkgsLLVM ;
95
+ uefi-x86_64 = mkMobileSystem "uefi-x86_64" gnu64 ;
96
+ llvm-uefi-x86_64 = mkMobileSystem "uefi-x86_64" gnu64 . pkgsLLVM ;
91
97
} ;
92
98
} ) ) ;
93
99
}
You can’t perform that action at this time.
0 commit comments