cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #295257 from Scrumplex/pkgs/gimp-plugin-gap/fix-build-2

Browse source 
gimpPlugins.gap: patch ffmpeg to avoid asm error
This commit is contained in:
Sandro 2024-04-13 22:39:04 +02:00 committed by GitHub
commit 4927aeab6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/graphics/gimp/plugins/default.nix
View file

@ -5,7 +5,7 @@
{ config, lib, pkgs }: { config, lib, pkgs }:
let let
inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub fetchFromGitLab; inherit (pkgs) stdenv fetchurl fetchpatch fetchpatch2 pkg-config intltool glib fetchFromGitHub fetchFromGitLab;
in in
lib.makeScope pkgs.newScope (self: lib.makeScope pkgs.newScope (self:
@ -123,6 +123,23 @@ in
nativeBuildInputs = with pkgs; [autoreconfHook]; nativeBuildInputs = with pkgs; [autoreconfHook];
postUnpack = ''
tar -xf $sourceRoot/extern_libs/ffmpeg.tar.gz -C $sourceRoot/extern_libs
'';
postPatch = let
ffmpegPatch = fetchpatch2 {
name = "fix-ffmpeg-binutil-2.41.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb";
hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY=";
};
in ''
patch -Np1 -i ${ffmpegPatch} -d extern_libs/ffmpeg
ffmpegSrc=$(realpath extern_libs/ffmpeg)
'';
configureFlags = ["--with-ffmpegsrcdir=${placeholder "ffmpegSrc"}"];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
env = { env = {