mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
survex: 1.4.3 -> 1.4.11
Includes fixes for FFmpeg 7.
This commit is contained in:
parent
192fd67cc3
commit
1da61cd562
@ -13,6 +13,7 @@
|
|||||||
, perl
|
, perl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, proj
|
, proj
|
||||||
|
, gdal
|
||||||
, python3
|
, python3
|
||||||
, wrapGAppsHook3
|
, wrapGAppsHook3
|
||||||
, wxGTK32
|
, wxGTK32
|
||||||
@ -20,21 +21,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "survex";
|
pname = "survex";
|
||||||
version = "1.4.3";
|
version = "1.4.11";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
|
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
|
||||||
hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM=";
|
hash = "sha256-Q+86sDfU3zYhRhnnO2rfzwmF3CmWPYcIf2VeQctIZ7Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix cavern.tst to work with SOURCE_DATE_EPOCH set
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch";
|
|
||||||
hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
perl
|
perl
|
||||||
pkg-config
|
pkg-config
|
||||||
@ -46,6 +39,7 @@ stdenv.mkDerivation rec {
|
|||||||
ffmpeg
|
ffmpeg
|
||||||
glib
|
glib
|
||||||
proj
|
proj
|
||||||
|
gdal
|
||||||
wxGTK32
|
wxGTK32
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
Carbon
|
Carbon
|
||||||
|
Loading…
Reference in New Issue
Block a user