diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2019-05-01 19:47:53 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2019-06-20 13:36:11 +0200 |
| commit | 46d25e912d35351ba900e8a0d5107112f6ea1fdc (patch) | |
| tree | 46ceeb0ff3ccde5b6f161596ba58a02375fb7779 /pkgs/development/libraries/gstreamer | |
| parent | 95bea558028292013173759554933310d7a0952e (diff) | |
| download | nixpkgs-46d25e912d35351ba900e8a0d5107112f6ea1fdc.tar nixpkgs-46d25e912d35351ba900e8a0d5107112f6ea1fdc.tar.gz nixpkgs-46d25e912d35351ba900e8a0d5107112f6ea1fdc.tar.bz2 nixpkgs-46d25e912d35351ba900e8a0d5107112f6ea1fdc.tar.lz nixpkgs-46d25e912d35351ba900e8a0d5107112f6ea1fdc.tar.xz nixpkgs-46d25e912d35351ba900e8a0d5107112f6ea1fdc.tar.zst nixpkgs-46d25e912d35351ba900e8a0d5107112f6ea1fdc.zip | |
gst_all_1.gst-plugins-bad: Fix gsm dependency
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/bad/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index cff909c3cf3..0945dccde81 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -13,6 +13,7 @@ , directfb , fdk_aac , flite +, gsm , libaom , libdc1394 , libde265 @@ -71,6 +72,16 @@ stdenv.mkDerivation rec { patches = [ ./fix_pkgconfig_includedir.patch + # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/99790eaad9083cce5ab2b1646489e1a1c0faad1e.patch"; + sha256 = "11bqy4sl05qq5mj4bx5s09rq106s3j0vnpjl4np058im32j69lr3"; + }) + # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/1872da81c48d3a719bd39955fd97deac7d037d74.patch"; + sha256 = "11zwrr5ggflmvr0qfssj7dmhgd3ybiadmy79b4zh24022zgw3xpz"; + }) ]; src = fetchurl { @@ -102,6 +113,7 @@ stdenv.mkDerivation rec { directfb fdk_aac flite + gsm libaom libdc1394 libde265 @@ -145,7 +157,6 @@ stdenv.mkDerivation rec { "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" - "-Dgsm=disabled" # as of writing, with `gsm` in `buildInputs` we get "GSM plugin is enabled: found libgsm but no headers"; gsm packaging problem? "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support # As of writing, with `libmpcdec` in `buildInputs` we get |