about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2019-09-24 10:52:09 +0800
committerGitHub <noreply@github.com>2019-09-24 10:52:09 +0800
commit91d748670355b4f10ff63d4c6f7cd083613a6528 (patch)
tree169a2ab22a71ff3b983e3a2541abb85dc7cc1501 /pkgs/top-level
parentc5e5974c96fc46dba1e2e7ce5a23fde79499e488 (diff)
parent751b661a0981e292bb705f429b6be43078325baf (diff)
downloadnixlib-91d748670355b4f10ff63d4c6f7cd083613a6528.tar
nixlib-91d748670355b4f10ff63d4c6f7cd083613a6528.tar.gz
nixlib-91d748670355b4f10ff63d4c6f7cd083613a6528.tar.bz2
nixlib-91d748670355b4f10ff63d4c6f7cd083613a6528.tar.lz
nixlib-91d748670355b4f10ff63d4c6f7cd083613a6528.tar.xz
nixlib-91d748670355b4f10ff63d4c6f7cd083613a6528.tar.zst
nixlib-91d748670355b4f10ff63d4c6f7cd083613a6528.zip
Merge pull request #69097 from peterhoeg/u/hedgewars
hedgewars: 1.0.0-beta1 -> 1.0.0-beta2
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fa376c45126..39b2490ad67f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22091,9 +22091,8 @@ in
 
   hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
 
-  hedgewars = callPackage ../games/hedgewars {
+  hedgewars = libsForQt5.callPackage ../games/hedgewars {
     inherit (haskellPackages) ghcWithPackages;
-    ffmpeg = ffmpeg_2;
   };
 
   hexen = callPackage ../games/hexen { };