From 52a1179b6c20e923beddde1dd1e0034aa19176d2 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 22 Sep 2018 23:13:10 +0200 Subject: [PATCH] ffmpeg: don't use gcc on darwin (#47189) This isn't necessary and causes build failures for certain versions. CC libavfilter/libmpcodecs/vf_eq2.o CC libavfilter/libmpcodecs/vf_fil.o CC libavfilter/libmpcodecs/vf_fspp.o libavfilter/libmpcodecs/vf_fspp.c:939:18: error: unknown token in expression movq %mm2, 0*8+(%rsp) /cc ZHF #45961 --- pkgs/top-level/all-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18ad8892e55..fd91049b52f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9333,23 +9333,18 @@ with pkgs; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - stdenv = gccStdenv; }; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - stdenv = gccStdenv; }; # Aliases