diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-24 17:14:28 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:39:53 +0100 |
| commit | f6a3f5af36824cc99ad910389c0b22d4c9ffcadd (patch) | |
| tree | 6696e051af31b4e2f148ba3a848267c7c38dc61a /pkgs/applications | |
| parent | 6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e (diff) | |
treewide: structured-attrs fixes
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/kde/print-manager.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/signal-cli/default.nix | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index f869f984e0018..f0501ffadee48 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -22,8 +22,5 @@ mkDerivation { outputs = [ "out" "dev" ]; # Fix build with cups deprecations etc. # See: https://github.com/NixOS/nixpkgs/issues/73334 - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - "-Wno-error=format-security" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; } diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index c821c4b0f44e4..8471f43c6dd06 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv"; }; - buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ]; + buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' |