b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #200733 from trofi/djv-zhf-fix

Browse source
This commit is contained in:
Martin Weinelt 2022-11-12 14:45:13 +01:00 committed by GitHub
parent 33a1bcace4 9b0e6f44a8
commit 838f74ee08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/graphics/djv/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, cmake
, fetchFromGitHub
, fetchpatch
, lib
, alsa-lib
, libGL
@ -107,6 +108,25 @@ stdenv.mkDerivation rec {
version = djvVersion;
src = djvSrc;
patches = [
# Pull fix ending upstream inclusion for gcc-12+ support:
# https://github.com/darbyjohnston/DJV/pull/477
(fetchpatch {
name = "gcc-11-limits.patch";
url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch";
hash = "sha256-x6ye0xMwTlKyNW4cVFb64RvAayvo71kuOooPj3ROn0g=";
})
(fetchpatch {
name = "gcc-11-IO.patch";
url = "https://github.com/darbyjohnston/DJV/commit/ce79f2d2cb35d03322648323858834bff942c792.patch";
hash = "sha256-oPbXOnN5Y5QL+bs/bL5eJALu45YHnyTBLQcC8XcJi0c=";
})
(fetchpatch {
name = "gcc-11-sleep_for.patch";
url = "https://github.com/darbyjohnston/DJV/commit/6989f43db27f66a7691f6048a2eb3299ef43a92e.patch";
hash = "sha256-1kiF3VrZiO+FSoR7NHCbduQ8tMq/Uuu6Z+sQII4xBAw=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [

2
pkgs/top-level/all-packages.nix
View file

@ -3819,7 +3819,7 @@ with pkgs;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
};
djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; };
djv = callPackage ../applications/graphics/djv { };
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };