diff options
| author | Artturin <Artturin@artturin.com> | 2022-12-09 00:26:13 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-12-09 01:16:08 +0200 |
| commit | c55b931644dca89671a25de47d8d207dd37d6555 (patch) | |
| tree | 524e49c0ac788a7823d5322b5802aaf6fc4e5b6d /pkgs/servers | |
| parent | e600ef059cf2aa85896094981d81b459dec141c6 (diff) | |
treewide: fix lints and remove a unneeded cmake input
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/libreddit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/uptime-kuma/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/photoprism/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/search/elasticsearch/6.x.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 0209102eb8d9c..2aa7159a5f99d 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-uIr8aUDErHVUKML2l6nITSBpOxqg3h1Md0948BxvutI="; - buildInputs = lib.optional stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 45d9e2c19f3aa..515e4e2edaf4c 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, substituteAll, nixosTests, iputils }: +{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, nixosTests, iputils, nodejs, makeWrapper }: let deps = import ./composition.nix { inherit pkgs; }; in @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/sbin/ping" "${iputils}/bin/ping" ''; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/share/ @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = '' - makeWrapper ${pkgs.nodejs}/bin/node $out/bin/uptime-kuma-server \ + makeWrapper ${nodejs}/bin/node $out/bin/uptime-kuma-server \ --add-flags $out/share/server/server.js \ --chdir $out/share/ ''; diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 678f30c372d06..a33d3d1830042 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { inherit pname version; - buildInputs = [ + nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index f14138ca08971..87750f196f3fc 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre_headless util-linux ] - ++ optional enableUnfree [ zlib libxcrypt ]; + ++ optionals enableUnfree [ zlib libxcrypt ]; installPhase = '' mkdir -p $out |