Unverified Commit c7cc1d72 authored by Pierre Bourdon's avatar Pierre Bourdon Committed by GitHub
Browse files

Merge pull request #254108 from anund/audiobookshelf_getopt_fix 

audiobookshelf: fix reference to getopt in wrapper
parents 2caef904 bbc6174e

pkgs/servers/audiobookshelf/default.nix

+15 −2
Original line number Diff line number Diff line 
{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_18, tone, ffmpeg-full, util-linux, python3 }:

{

  lib,

  stdenv,

  pkgs,

  fetchFromGitHub,

  runCommand,

  buildNpmPackage,

  nodejs_18,

  tone,

  ffmpeg-full,

  util-linux,

  python3,

  getopt

}:



let

  nodejs = nodejs_18;
@@ -28,7 +41,7 @@ let 
  };



  wrapper = import ./wrapper.nix {

    inherit stdenv ffmpeg-full tone pname nodejs;

    inherit stdenv ffmpeg-full tone pname nodejs getopt;

  };



in buildNpmPackage {

pkgs/servers/audiobookshelf/wrapper.nix

+3 −3
Original line number Diff line number Diff line 
{ stdenv, ffmpeg-full, tone, pname, nodejs }: ''

{ stdenv, ffmpeg-full, tone, pname, nodejs, getopt }: ''

    #!${stdenv.shell}



    port=8000
@@ -7,7 +7,7 @@ 
    metadata=$(pwd)/metadata



    LONGOPTS=host:,port:,config:,metadata:,help

    args=$(getopt -l "$LONGOPTS" -o h -- "$@")

    args=$(${getopt}/bin/getopt -l "$LONGOPTS" -o h -- "$@")



    eval set -- "$args"
@@ -44,7 +44,7 @@ 
          ;;

        --help|-h)

          echo "Usage: audiobookshelf [--host <host>] [--port <port>] [--metadata <dir>] [--config <dir>]"

          shift

          exit 0

          ;;

      esac

      shift