treewide: fix types for mkDerivation params

2019-12-31 01:23:19 +01:00
parent 81ffabdf4f
commit 006242fd5a
18 changed files with 90 additions and 98 deletions
@@ -34,7 +34,7 @@
 }:

 let
-  optional = stdenv.lib.optional;
+  inherit (stdenv.lib) optional optionals;
 in mkDerivation rec {
  pname = "obs-studio";
  version = "24.0.4";
@@ -46,9 +46,7 @@ in mkDerivation rec {
    sha256 = "0m15ch2ix9qrdf1a9mj7wcpl72z3h13zx60c9q72sb1435id2g1q";
  };

-  nativeBuildInputs = [ cmake
-                        pkgconfig
-                      ];
+  nativeBuildInputs = [ cmake pkgconfig ];

  buildInputs = [ curl
                  fdk_aac
@@ -68,7 +66,7 @@ in mkDerivation rec {
                  makeWrapper
                  mbedtls
                ]
-                ++ optional scriptingSupport [ luajit swig python3 ]
+                ++ optionals scriptingSupport [ luajit swig python3 ]
                ++ optional alsaSupport alsaLib
                ++ optional pulseaudioSupport libpulseaudio;