diff --git a/modules/apps.nix b/modules/apps.nix index 2f30a77..3030d32 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -8,12 +8,7 @@ let mkTransposedPerSystemModule ; - getExe = lib.getExe or ( - x: - "${lib.getBin x}/bin/${x.meta.mainProgram or (throw ''Package ${x.name or ""} does not have meta.mainProgram set, so I don't know how to find the main executable. You can set meta.mainProgram, or pass the full path to executable, e.g. program = "''${pkg}/bin/foo"'')}" - ); - - programType = lib.types.coercedTo derivationType getExe lib.types.str; + programType = lib.types.coercedTo derivationType lib.getExe lib.types.str; derivationType = lib.types.package // { check = lib.isDerivation; @@ -56,7 +51,7 @@ mkTransposedPerSystemModule { description = '' Programs runnable with nix run ``. ''; - example = lib.literalExpression or lib.literalExample '' + example = lib.literalExpression '' { default.program = "''${config.packages.hello}/bin/hello"; } diff --git a/modules/overlays.nix b/modules/overlays.nix index 84285ff..172336c 100644 --- a/modules/overlays.nix +++ b/modules/overlays.nix @@ -14,7 +14,7 @@ in # This eta expansion exists for the sole purpose of making nix flake check happy. apply = lib.mapAttrs (_k: f: final: prev: f final prev); default = { }; - example = lib.literalExpression or lib.literalExample '' + example = lib.literalExpression '' { default = final: prev: {}; }