gst_all_1: fix botched merge

23741692 merged staging incorrectly
2018-04-26 20:40:35 +02:00
parent f925480215
commit 6c5d860c8b
2 changed files with 3 additions and 10 deletions
@@ -13,13 +13,7 @@
 assert faacSupport -> faac != null;

 let
-  inherit (stdenv.lib) optional optionalString;
-
-  # OpenJPEG version is hardcoded in package source
-  openJpegVersion = with stdenv;
-    lib.concatStringsSep "." (lib.lists.take 2
-      (lib.splitString "." (lib.getVersion openjpeg)));
-
+  inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
  name = "gst-plugins-bad-1.14.0";
@@ -76,6 +70,4 @@ stdenv.mkDerivation rec {
    ++ optional (!stdenv.isDarwin) wildmidi
    # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
    ++ optional (!stdenv.isDarwin) mjpegtools;
-
-  enableParallelBuilding = true;
 }