diff options
author | Niklas Hambüchen <mail@nh2.me> | 2019-01-21 02:48:04 +0100 |
---|---|---|
committer | Niklas Hambüchen <mail@nh2.me> | 2019-06-20 13:36:11 +0200 |
commit | 1a6e572529595d146a259fa433785ebb3215d8d2 (patch) | |
tree | db5d2b23882503e4344317369db907a6950c1871 /pkgs/development/libraries/gstreamer/ugly/default.nix | |
parent | 025fcad11ab21925ecd519f4588e89f9e5a4b6ed (diff) | |
download | nixpkgs-1a6e572529595d146a259fa433785ebb3215d8d2.tar nixpkgs-1a6e572529595d146a259fa433785ebb3215d8d2.tar.gz nixpkgs-1a6e572529595d146a259fa433785ebb3215d8d2.tar.bz2 nixpkgs-1a6e572529595d146a259fa433785ebb3215d8d2.tar.lz nixpkgs-1a6e572529595d146a259fa433785ebb3215d8d2.tar.xz nixpkgs-1a6e572529595d146a259fa433785ebb3215d8d2.tar.zst nixpkgs-1a6e572529595d146a259fa433785ebb3215d8d2.zip |
gstreamer: 1.14.4 -> 1.15.1, and extended gst-plugins-bad.
During the 1.14 -> 1.15 upgrade, lots of stuff stopped working because gstreamer changed what features are enabled by default and which ones are automatically turned on/off via pkgconfig dependency detection. This resulted in the `gstreamer` ("core" attribute in nixpkgs) package to have only 15 of its previous 163 build targets enabled, and downstream packages breaking correspondingly. To ease maintainability and to ensure users will find the expected features available (and when not, will see in the nix file why not), we now pass the `-Dauto_features=enabled` Meson build flag to all gstreamer builds, which sets all `auto` dependencies to `enabled`, and we explicitly disable those that we can't build. This means in particular that `gst-plugins-bad` now has vastly more integrations (namely all for which nixpkgs has libraries available).
Diffstat (limited to 'pkgs/development/libraries/gstreamer/ugly/default.nix')
-rw-r--r-- | pkgs/development/libraries/gstreamer/ugly/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 0cdfd1f4a7b..19d84cbd349 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -2,12 +2,13 @@ , gst-plugins-base, orc, gettext , a52dec, libcdio, libdvdread , libmad, libmpeg2, x264, libintl, lib +, opencore-amr , darwin }: stdenv.mkDerivation rec { name = "gst-plugins-ugly-${version}"; - version = "1.14.4"; + version = "1.15.1"; meta = with lib; { description = "Gstreamer Ugly Plugins"; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "08vd1xgwmapnviah47zv5h2r02qdd20y4f07rvv5zhv6y4vxh0mc"; + sha256 = "17p9x30ywanz1lbk061kzd8bypcv5hkin6iyaqffp8alrwiak3qp"; }; outputs = [ "out" "dev" ]; @@ -37,8 +38,16 @@ stdenv.mkDerivation rec { a52dec libcdio libdvdread libmad libmpeg2 x264 libintl + opencore-amr ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit CoreFoundation DiskArbitration ]); + mesonFlags = [ + # Enables all features, so that we know when new dependencies are necessary. + "-Dauto_features=enabled" + "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing + ]; + NIX_LDFLAGS = [ "-lm" ]; } |