diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
| commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/games/nethack/default.nix | |
| parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
| parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) | |
| download | nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2 nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/games/nethack/default.nix')
| -rw-r--r-- | pkgs/games/nethack/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index d4ad1119b9f5..3f9ec93f8618 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - patchPhase = '' + postPatch = '' sed -e '/^ *cd /d' -i sys/unix/nethack.sh sed \ -e 's/^YACC *=.*/YACC = bison -y/' \ @@ -53,6 +53,7 @@ in stdenv.mkDerivation rec { `pkg-config Qt5Multimedia --libs`,' \ -i sys/unix/Makefile.src sed \ + -e 's,^CFLAGS=-g,CFLAGS=,' \ -e 's,/bin/gzip,${gzip}/bin/gzip,g' \ -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux @@ -60,6 +61,7 @@ in stdenv.mkDerivation rec { -e 's,^CC=.*$,CC=cc,' \ -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ + -e 's,^CFLAGS=-g,CFLAGS=,' \ -i sys/unix/hints/macosx10.10 sed -e '/define CHDIR/d' -i include/config.h sed \ @@ -71,11 +73,11 @@ in stdenv.mkDerivation rec { ''; configurePhase = '' - cd sys/${platform} + pushd sys/${platform} ${lib.optionalString (platform == "unix") '' sh setup.sh hints/${unixHint} ''} - cd ../.. + popd ''; postInstall = '' |