mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
rabbitmq-server: Apply nixpkgs-review hints
This commit is contained in:
parent
b0f33d7c2e
commit
4d5c2bc76e
1 changed files with 2 additions and 9 deletions
|
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc";
|
sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]
|
[ erlang elixir python libxml2 libxslt glibcLocales ]
|
||||||
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
|
++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
|
||||||
|
|
||||||
outputs = [ "out" "man" "doc" ];
|
outputs = [ "out" "man" "doc" ];
|
||||||
|
@ -40,13 +40,6 @@ stdenv.mkDerivation rec {
|
||||||
# rabbitmq-env calls to sed/coreutils, so provide everything early
|
# rabbitmq-env calls to sed/coreutils, so provide everything early
|
||||||
sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
|
sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|'
|
||||||
|
|
||||||
# rabbitmq-server script uses `dirname` to get hold of a
|
|
||||||
# rabbitmq-env, so let's provide this file directly. After that
|
|
||||||
# point everything is OK - the PATH above will kick in
|
|
||||||
substituteInPlace $out/sbin/rabbitmq-server \
|
|
||||||
--replace '`dirname $0`/rabbitmq-env' \
|
|
||||||
"$out/sbin/rabbitmq-env"
|
|
||||||
|
|
||||||
# We know exactly where rabbitmq is gonna be, so we patch that into the env-script.
|
# We know exactly where rabbitmq is gonna be, so we patch that into the env-script.
|
||||||
# By doing it early we make sure that auto-detection for this will
|
# By doing it early we make sure that auto-detection for this will
|
||||||
# never be executed (somewhere below in the script).
|
# never be executed (somewhere below in the script).
|
||||||
|
|
Loading…
Reference in a new issue