diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-14 21:33:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 21:33:25 +0100 |
| commit | c846ede763bfb8a90630c641766185293e1d0560 (patch) | |
| tree | 238d074a925a8d3803b8c1654397036e25567989 /pkgs/development/tools/build-managers/meson | |
| parent | d29607c15a367f77594af9563c4eb7c6a3a7801e (diff) | |
| parent | 071d25afc796803a6ac98439a960541cd64d2fa8 (diff) | |
| download | nixpkgs-c846ede763bfb8a90630c641766185293e1d0560.tar nixpkgs-c846ede763bfb8a90630c641766185293e1d0560.tar.gz nixpkgs-c846ede763bfb8a90630c641766185293e1d0560.tar.bz2 nixpkgs-c846ede763bfb8a90630c641766185293e1d0560.tar.lz nixpkgs-c846ede763bfb8a90630c641766185293e1d0560.tar.xz nixpkgs-c846ede763bfb8a90630c641766185293e1d0560.tar.zst nixpkgs-c846ede763bfb8a90630c641766185293e1d0560.zip | |
gstreamer 1.16.1 (#70690)
gstreamer 1.16.1
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index fad5bc9e630..9722c26ad64 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,11 @@ -{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: +{ lib +, python3Packages +, fetchpatch +, stdenv +, writeTextDir +, substituteAll +, targetPackages +}: let # See https://mesonbuild.com/Reference-tables.html#cpu-families @@ -62,6 +69,15 @@ python3Packages.buildPythonApplication rec { # https://github.com/mesonbuild/meson/issues/4784 # Should be fixed in 0.52 ./fix-objc-linking.patch + + # Fixes error finding some frameworks + # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553704175 + # https://github.com/mesonbuild/meson/pull/5980 + # Should be fixed in 0.52 + (fetchpatch { + url = "https://github.com/mesonbuild/meson/pull/5980.patch"; + sha256 = "0g95gl662mribnnz5jcyn1jaaw8w7r1vgbg2jbm91dcrr5zji5ng"; + }) ]; setupHook = ./setup-hook.sh; |