summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2018-09-22 23:13:10 +0200
committerxeji <36407913+xeji@users.noreply.github.com>2018-09-22 23:13:10 +0200
commit52a1179b6c20e923beddde1dd1e0034aa19176d2 (patch)
tree289cfe6e440e2a105023b0a9161c09adc8dd655d /pkgs
parenta8413d816aadfa7b376dabc84777a21eca3dd210 (diff)
downloadnixlib-52a1179b6c20e923beddde1dd1e0034aa19176d2.tar
nixlib-52a1179b6c20e923beddde1dd1e0034aa19176d2.tar.gz
nixlib-52a1179b6c20e923beddde1dd1e0034aa19176d2.tar.bz2
nixlib-52a1179b6c20e923beddde1dd1e0034aa19176d2.tar.lz
nixlib-52a1179b6c20e923beddde1dd1e0034aa19176d2.tar.xz
nixlib-52a1179b6c20e923beddde1dd1e0034aa19176d2.tar.zst
nixlib-52a1179b6c20e923beddde1dd1e0034aa19176d2.zip
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
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18ad8892e55f..fd91049b52f8 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