JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #158177 from jonringer/update-gstream

Browse Source
This commit is contained in:
Martin Weinelt 2022-02-05 17:53:07 +01:00 committed by GitHub
commit 803057460c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/gstreamer/base/default.nix
View File

@ -41,19 +41,15 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-base";
version = "1.18.5";
version = "1.20.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M=";
sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw=";
};
patches = [
./fix_pkgconfig_includedir.patch
];
nativeBuildInputs = [
meson
ninja
@ -121,7 +117,7 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs \
common/scangobj-merge.py \
scripts/extract-release-date-from-doap-file.py
scripts/
'';
# This package has some `_("string literal")` string formats

8
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "gstreamer";
version = "1.18.5";
version = "1.20.0";
outputs = [
"bin"
@ -34,13 +34,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao=";
sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc=";
};
patches = [
./fix_pkgconfig_includedir.patch
];
nativeBuildInputs = [
meson
ninja

6
pkgs/development/libraries/gstreamer/libav/default.nix
View File

@ -5,6 +5,7 @@
, ninja
, pkg-config
, python3
, gstreamer
, gst-plugins-base
, gettext
, libav
@ -15,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "gst-libav";
version = "1.18.5";
version = "1.20.0";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-gi4AipEOndE67b3Y3GP+3vQEDA7i6Se6sxEuneaTpUg=";
sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc=";
};
outputs = [ "out" "dev" ];
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
gstreamer
gst-plugins-base
libav
];