diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/games/0ad/default.nix | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/games/0ad/default.nix')
| -rw-r--r-- | pkgs/games/0ad/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index f9eb90f34f8..e854af58865 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/share/applications while read LINE; do if [[ $LINE = "Exec=0ad" ]]; then - echo "Exec=$out/bin/pyrogenesis" + echo "Exec=$out/bin/zeroad" elif [[ $LINE = "Icon=0ad" ]]; then echo "Icon=$out/share/icons/0ad.png" else @@ -126,5 +126,6 @@ stdenv.mkDerivation rec { licenses.zlib # otherwise masked by pkgs.zlib ]; platforms = [ "x86_64-linux" "i686-linux" ]; + hydraPlatforms = []; # the data are too big (~1.5 GB) }; } |