diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-10-14 11:28:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-10-14 11:29:43 +0200 |
commit | 02dbdcddcd305680af69e9f9245a04605db18f88 (patch) | |
tree | 5e28bce36fa4dd5d1216470cd8e5e4d2f92661a4 /pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix | |
parent | e758436f98683a77b8cd119886c9ded8b8d80759 (diff) | |
parent | 72d36bec5c6142ccec115a2d8f29c6d54c0ed403 (diff) |
Merge branch 'staging-19.03' into release-19.03 (security)
Only x86_64-linux has managed to finish rebuilding so far https://hydra.nixos.org/eval/1548583 but I think that's a sufficient trade-off, given that regressions should be very unlikely.
Diffstat (limited to 'pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix')
-rw-r--r-- | pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index db75705c825ab..5a942b49cc03f 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -18,11 +18,18 @@ stdenv.mkDerivation rec { sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"; }; - patchPhase = '' + patches = [ + ./gcc-4.9.patch + (fetchurl { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/f672277509705c4034bc92a141eefee4524d15aa.patch"; + name = "CVE-2019-9928.patch"; + sha256 = "0hz3lsq3ppmaf329sbyi05y1qniqfj9vlp2f3z918383pvrcms4i"; + }) + ]; + + postPatch = '' sed -i 's@/bin/echo@echo@g' configure sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in - - patch -p1 < ${./gcc-4.9.patch} ''; outputs = [ "out" "dev" ]; |