Unverified Commit 4927aeab authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

gimpPlugins.gap: patch ffmpeg to avoid asm error
parents 62281e53 26013573

pkgs/applications/graphics/gimp/plugins/default.nix

+18 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
{ config, lib, pkgs }:



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



lib.makeScope pkgs.newScope (self:
@@ -123,6 +123,23 @@ in 


    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" ];



    env = {