diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-20 23:27:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-20 23:27:30 +0100 |
commit | 8d82b50624d3e19bd9d05d78fa7dbb6689cecf5f (patch) | |
tree | 719608140abe001686fcb9854b539355749ca880 | |
parent | bc5777fa1870a9c50c66df6fbfde04b67628580d (diff) | |
parent | e91b378f173c139958ead1ddb5082eb4a5f52a22 (diff) |
Merge pull request #294409 from loco-choco/owmods-cli-update
owmods-cli: Add mono wrap and fix man pages install
-rw-r--r-- | maintainers/maintainer-list.nix | 11 | ||||
-rw-r--r-- | pkgs/by-name/ow/owmods-cli/package.nix (renamed from pkgs/applications/misc/owmods-cli/default.nix) | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 28 insertions, 13 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 443c41dbb98fb..559517277e5f2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2941,6 +2941,12 @@ githubId = 37375448; name = "Buildit"; }; + bwc9876 = { + email = "bwc9876@gmail.com"; + github = "Bwc9876"; + githubId = 25644444; + name = "Ben C"; + }; bwlang = { email = "brad@langhorst.com"; github = "bwlang"; @@ -18403,6 +18409,11 @@ githubId = 950799; name = "Tomasz Czyż"; }; + spoonbaker = { + github = "Spoonbaker"; + githubId = 47164123; + name = "Spoonbaker"; + }; sprock = { email = "rmason@mun.ca"; github = "sprock"; diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 44a711dfeec17..19961f193e2ad 100644 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -6,34 +6,40 @@ , pkg-config , installShellFiles , zstd +, libsoup_3 +, makeWrapper +, mono +, wrapWithMono ? true , openssl -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-AfqpLL3cGZLKW5/BE6SaBe4S8GzYM2GKUZU8mFH5uX4="; + hash = "sha256-JCPuKGO0pbhQaNmZUcZ95EZbXubrjZnw0qJmKCGuAoQ="; }; - cargoHash = "sha256-PhdfpiUgeOB13ROgzPBYM+sBLGMP+RtV9j9ebo8PpJU="; + cargoHash = "sha256-dTEEpjonvFYFv16e0eS71B4OMiYueYSfcs8gmSYeHPc="; nativeBuildInputs = [ pkg-config installShellFiles - ]; + ] ++ lib.optional wrapWithMono makeWrapper; buildInputs = [ zstd + libsoup_3 ] ++ lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { @@ -44,9 +50,11 @@ rustPlatform.buildRustPackage rec { postInstall = '' cargo xtask dist_cli - installManPage man/man*/* + installManPage dist/cli/man/* installShellCompletion --cmd owmods \ - dist/cli/completions/owmods.{bash,fish,zsh} + dist/cli/completions/owmods.{bash,fish,zsh} + '' + lib.optionalString wrapWithMono '' + wrapProgram $out/bin/${meta.mainProgram} --prefix PATH : '${mono}/bin' ''; passthru.updateScript = nix-update-script {}; @@ -58,6 +66,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; mainProgram = "owmods"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ locochoco ]; + maintainers = with maintainers; [ bwc9876 spoonbaker locochoco ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5719b064e9eb8..969a20b303472 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40264,10 +40264,6 @@ with pkgs; jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); - owmods-cli = callPackage ../applications/misc/owmods-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - r128gain = callPackage ../applications/audio/r128gain { }; resp-app = libsForQt5.callPackage ../applications/misc/resp-app { }; |