nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: apply statix fixes

Browse source
This commit is contained in:
Tobias Happ 2022-09-03 17:11:00 +02:00
parent 7d1ed0fbaa
commit a5ed8b213f
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/default.nix
View file

@ -16,8 +16,7 @@ let
configModule = configModule =
if config != null then config if config != null then config
else if builtins.pathExists defaultConfigFile then defaultConfigFile else if builtins.pathExists defaultConfigFile then defaultConfigFile
else if pkgs.config ? nix-on-droid then pkgs.config.nix-on-droid else pkgs.config.nix-on-droid or (throw "No config file found! Create one in ~/.config/nixpkgs/nix-on-droid.nix");
else throw "No config file found! Create one in ~/.config/nixpkgs/nix-on-droid.nix";
rawModule = evalModules { rawModule = evalModules {
modules = [ modules = [

2
modules/home-manager.nix
View file

@ -128,7 +128,7 @@ in
# Fortunately, it's not that hard to us to workaround with just a symlink. # Fortunately, it's not that hard to us to workaround with just a symlink.
environment.etc = mkIf cfg.useUserPackages { environment.etc = mkIf cfg.useUserPackages {
"profiles/per-user/${config.user.userName}".source = "profiles/per-user/${config.user.userName}".source =
builtins.toPath "${config.user.home}/.nix-profile"; /. + "${config.user.home}/.nix-profile";
}; };
}; };

4
modules/nixpkgs/options.nix
View file

@ -28,12 +28,12 @@ let
optionalAttrs (lhs ? packageOverrides) { optionalAttrs (lhs ? packageOverrides) {
packageOverrides = pkgs: packageOverrides = pkgs:
optCall lhs.packageOverrides pkgs // optCall lhs.packageOverrides pkgs //
optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs; optCall (attrByPath [ "packageOverrides" ] { } rhs) pkgs;
} // } //
optionalAttrs (lhs ? perlPackageOverrides) { optionalAttrs (lhs ? perlPackageOverrides) {
perlPackageOverrides = pkgs: perlPackageOverrides = pkgs:
optCall lhs.perlPackageOverrides pkgs // optCall lhs.perlPackageOverrides pkgs //
optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs; optCall (attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs;
}; };
configType = mkOptionType { configType = mkOptionType {

2
tests/proot-test.nix
View file

@ -3,7 +3,7 @@
{ pkgs ? (import ../pkgs/lib/load-nixpkgs.nix { }) }: { pkgs ? (import ../pkgs/lib/load-nixpkgs.nix { }) }:
pkgs.callPackage ../pkgs/proot-termux { pkgs.callPackage ../pkgs/proot-termux {
stdenv = pkgs.stdenv; inherit (pkgs) stdenv;
static = false; static = false;
outputBinaryName = "proot"; outputBinaryName = "proot";
} }