diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-06-07 15:39:09 +0300 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-06-12 11:55:31 -0700 |
| commit | 01d4e2fe332420684803170597d1b88e9f826303 (patch) | |
| tree | 0a998e2bf5326595ec4a1fcffad7bfd963760dad /pkgs/applications/gis | |
| parent | 8e1dcea3d575dfd4ecdee336e5b95c093f3017cb (diff) | |
| download | nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.gz nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.bz2 nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.lz nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.xz nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.tar.zst nixpkgs-01d4e2fe332420684803170597d1b88e9f826303.zip | |
treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change.
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/grass/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index cb574ffc8f1..420f57bb93f 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas +, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas + readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); |