diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-13 11:02:21 +0200 |
| commit | 1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02 (patch) | |
| tree | bae982223d71e1d3760d022a26f2e06b7202e255 /pkgs/development/haskell-modules/configuration-nix.nix | |
| parent | 98f95ef9c4559c96cf852e5c0dae1d5124145a78 (diff) | |
| parent | 0905a5d99031c213c20c962e9501a2202602741b (diff) | |
| download | nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.gz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.bz2 nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.lz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.xz nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.tar.zst nixlib-1523382160220d7cd1fc6a7ff91b6eeb8ce5dc02.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 472b1fc75691..ec14c565b74e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -724,7 +724,7 @@ self: super: builtins.intersectAttrs super { dhall_1_32_0 = dontCheck super.dhall_1_32_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ |