nix: inherit self from destructured args; get rid of rec
This commit is contained in:
12
flake.nix
12
flake.nix
@@ -10,10 +10,16 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {flake-parts, ...}:
|
outputs = {
|
||||||
|
self,
|
||||||
|
flake-parts,
|
||||||
|
nixpkgs,
|
||||||
|
systems,
|
||||||
|
...
|
||||||
|
} @ inputs:
|
||||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||||
imports = [flake-parts.flakeModules.easyOverlay];
|
imports = [flake-parts.flakeModules.easyOverlay];
|
||||||
systems = import inputs.systems;
|
systems = import systems;
|
||||||
|
|
||||||
perSystem = {
|
perSystem = {
|
||||||
self',
|
self',
|
||||||
@@ -80,7 +86,7 @@
|
|||||||
overlayAttrs = config.packages;
|
overlayAttrs = config.packages;
|
||||||
};
|
};
|
||||||
|
|
||||||
flake = {self, ...}: {
|
flake = {
|
||||||
homeManagerModules = {
|
homeManagerModules = {
|
||||||
anyrun = import ./nix/hm-module.nix self;
|
anyrun = import ./nix/hm-module.nix self;
|
||||||
default = self.homeManagerModules.anyrun;
|
default = self.homeManagerModules.anyrun;
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
glib,
|
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
|
lockFile,
|
||||||
|
# Dependencies for Anyrun
|
||||||
|
glib,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
atk,
|
atk,
|
||||||
gtk3,
|
gtk3,
|
||||||
@@ -11,16 +13,19 @@
|
|||||||
rustfmt,
|
rustfmt,
|
||||||
cargo,
|
cargo,
|
||||||
rustc,
|
rustc,
|
||||||
lockFile,
|
# Additional configuration arguments for the
|
||||||
|
# derivation. By default, we should not build
|
||||||
|
# any of the plugins.
|
||||||
dontBuildPlugins ? true,
|
dontBuildPlugins ? true,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
cargoToml = builtins.fromTOML (builtins.readFile ../anyrun/Cargo.toml);
|
inherit (builtins) fromTOML readFile;
|
||||||
|
cargoToml = fromTOML (readFile ../anyrun/Cargo.toml);
|
||||||
|
pname = cargoToml.package.name;
|
||||||
|
version = cargoToml.package.version;
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage {
|
||||||
pname = cargoToml.package.name;
|
inherit pname version;
|
||||||
version = cargoToml.package.version;
|
|
||||||
|
|
||||||
src = ../.;
|
src = ../.;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
Reference in New Issue
Block a user