diff options
| author | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-01-22 22:58:51 +0900 |
|---|---|---|
| committer | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-01-23 08:10:07 +0900 |
| commit | ee6086c31dd8ddca8446fc405a1f80eb93684ad1 (patch) | |
| tree | f46de833776f044768ded79ae17cd5af442dcc45 /pkgs/games/cataclysm-dda/default.nix | |
| parent | fc06a987a07e602ad9e340b77f54623157f55313 (diff) | |
| download | nixlib-ee6086c31dd8ddca8446fc405a1f80eb93684ad1.tar nixlib-ee6086c31dd8ddca8446fc405a1f80eb93684ad1.tar.gz nixlib-ee6086c31dd8ddca8446fc405a1f80eb93684ad1.tar.bz2 nixlib-ee6086c31dd8ddca8446fc405a1f80eb93684ad1.tar.lz nixlib-ee6086c31dd8ddca8446fc405a1f80eb93684ad1.tar.xz nixlib-ee6086c31dd8ddca8446fc405a1f80eb93684ad1.tar.zst nixlib-ee6086c31dd8ddca8446fc405a1f80eb93684ad1.zip | |
cataclysm-dda{,-git}: no need for wrapper anymore
Diffstat (limited to 'pkgs/games/cataclysm-dda/default.nix')
| -rw-r--r-- | pkgs/games/cataclysm-dda/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index a06b53ac219d..b37e87c74f59 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, +{ fetchFromGitHub, stdenv, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, freetype, gettext, Cocoa, libicns }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ] + nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isDarwin [ libicns ]; buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ] @@ -41,10 +41,7 @@ stdenv.mkDerivation rec { png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/* ''; - postInstall = '' - wrapProgram $out/bin/cataclysm-tiles \ - --add-flags "--datadir $out/share/cataclysm-dda/" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' app=$out/Applications/Cataclysm.app install -D -m 444 data/osx/Info.plist -t $app/Contents install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources |