| 7 Sep 2021 |
 kranzes | there are two options for me, one to use git revert to revert that commit | 23:55:05 |
| kranzes | * there are three options for me, one to use git revert to revert that commit | 23:55:14 |
 danielrf | Does forklineageos already provide the MicroG apk as well as the patch? | 23:55:22 |
| kranzes | second, remove some of the patches that microg through robotnix does | 23:55:41 |
| kranzes | third to patch frameworks_base from forklineageos through robotnix | 23:56:09 |
| kranzes | In reply to @danielrf:matrix.org
Does forklineageos already provide the MicroG apk as well as the patch? no | 23:56:11 |
| kranzes | it just has that spoofing thing | 23:56:11 |
| kranzes | what i used to do is fork forklineageos's base frameworks | 23:56:53 |
| kranzes | then run git revert on it | 23:57:00 |
| kranzes | but thats a bit of a hass;e | 23:57:03 |
| kranzes | * but thats a bit of a hassle | 23:57:04 |
| kranzes | In reply to @kranzes:matrix.org
third to patch frameworks_base from forklineageos through robotnix this i think maybe makes the most sense | 23:57:48 |
| kranzes | but i dont know how to write patches | 23:57:53 |
| danielrf | Do you know about the revert option in pkgs.fetchpatch? | 23:58:29 |
| kranzes | no | 23:58:37 |
| kranzes | 🤔 | 23:58:56 |
| danielrf | Well it does what it sounds like. I sometimes use it to revert commits that upstream provides that we don't want | 23:59:15 |
| kranzes | In reply to @danielrf:matrix.org
Well it does what it sounds like. I sometimes use it to revert commits that upstream provides that we don't want that is exactly what i am looking for | 23:59:30 |
| kranzes | could you show me how to use it in the flake.nix? | 23:59:36 |
| danielrf | e.g. https://github.com/danielfullmer/robotnix/blob/d9018fbaed2eadf81b85b6dd075a4994230e3b97/flavors/lineageos/default.nix#L105 | 23:59:42 |
| 8 Sep 2021 |
| danielrf | it would be something like: source.dirs."frameworks/base".patches = lib.mkBefore [ (pkgs.fetchPatch ....) ]; | 00:00:29 |
| kranzes | what is that .patch file exactly | 00:00:43 |
| kranzes | * what is that .patch file exactly? | 00:00:50 |
| kranzes | also why do we need mkBefore there? | 00:01:15 |
| danielrf | This URL: https://github.com/ForkLineageOS/android_frameworks_base/commit/ee9742b6728f0ecb089d8783c0b8bee17debacfa.patch | 00:01:21 |
| kranzes | Oh i didnt know git has that | 00:01:38 |
| danielrf | mkBefore will ensure that it applied this reverted patch before the microg.nix module applies its own patch | 00:01:40 |
| danielrf | * mkBefore will ensure that it applies this reverted patch before the microg.nix module applies its own patch | 00:02:05 |
| kranzes | Im trying to mimick your personal robotnix flake.nix in terms of adding the nixpkgs input but it does not seem to work | 00:10:49 |
| kranzes | {
description = "A (not so) basic robotnix configuration";
inputs = {
robotnix.url = "github:Kranzes/robotnix-forklineageos";
inputs.nixpkgs.follows = "robotnix/nixpkgs";
device_xiaomi_miatoll = { url = "github:sairam1411/device_xiaomi_miatoll"; flake = false; };
device_xiaomi_sm6250-common = { url = "github:sairam1411/device_xiaomi_sm6250-common"; flake = false; };
vendor_xiaomi_miatoll = { url = "github:sairam1411/vendor_xiaomi_miatoll"; flake = false; };
vendor_xiaomi_sm6250-common = { url = "github:sairam1411/vendor_xiaomi_sm6250-common"; flake = false; };
kernel_xiaomi_sm6250 = { url = "github:sairam1411/kernel_xiaomi_sm6250"; flake = false; };
};
outputs = { self, robotnix, nixpkgs, ... }@inputs: {
robotnixConfigurations."miatoll" = robotnix.lib.robotnixSystem ({ config, pkgs, lib, ... }: {
device = "miatoll";
flavor = "lineageos";
androidVersion = 11;
signing.enable = true;
signing.keyStorePath = "/home/1TB-HDD/Android/keys";
apps.bromite.enable = false;
apps.chromium.enable = false;
webview = {
chromium = {
enable = false;
availableByDefault = false;
};
bromite = {
enable = true;
availableByDefault = true;
};
};
microg.enable = true;
# needed for robotnix's microg module to work
source.dirs."frameworks/base".patches = lib.mkBefore [
(pkgs.fetchPatch {
url = "https://github.com/ForkLineageOS/android_frameworks_base/commit/ee9742b6728f0ecb089d8783c0b8bee17debacfa.patch";
sha256 = lib.fakeHash;
revert = true;
})
];
source.dirs = {
"device/xiaomi/miatoll".src = inputs.device_xiaomi_miatoll;
"device/xiaomi/sm6250-common".src = inputs.device_xiaomi_sm6250-common;
"vendor/xiaomi/miatoll".src = inputs.vendor_xiaomi_miatoll;
"vendor/xiaomi/sm6250-common".src = inputs.vendor_xiaomi_sm6250-common;
"kernel/xiaomi/sm6250".src = inputs.kernel_xiaomi_sm6250;
};
});
defaultPackage.x86_64-linux = self.robotnixConfigurations."miatoll".ota;
};
}
| 00:11:01 |
