diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:51:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:51:31 +0200 |
| commit | 209730208a2ec0e3158303271d058dc851f83b99 (patch) | |
| tree | 286b2abfb02d711233ae9b4f7f7b755de27843ac /pkgs/games | |
| parent | aa5a93e21d77e2c2464b39a5f4dabbfebfb225b4 (diff) | |
| parent | cbabebcc2e3b884296fedf8591e04f59240b3939 (diff) | |
| download | nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.gz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.bz2 nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.lz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.xz nixlib-209730208a2ec0e3158303271d058dc851f83b99.tar.zst nixlib-209730208a2ec0e3158303271d058dc851f83b99.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/exult/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/gltron/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/typespeed/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 36ea8a7a3d58..a90e50fac629 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0a03a2l3ji6h48n106d4w55l8v6lni1axniafnvvv5c5n3nz5bgd"; }; - configureFlags = "--disable-tools"; + configureFlags = [ "--disable-tools" ]; patches = [ # Arch Linux patch set. diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index 6ede118526d8..610fba5057d0 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; # The build fails, unless we disable the default -Wall -Werror - configureFlags = "--disable-warn"; + configureFlags = [ "--disable-warn" ]; buildInputs = [ SDL libGLU_combined zlib libpng libvorbis libmikmod SDL_sound ]; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 45067d963975..6f0afc359ab4 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { patches = [ ./typespeed-config-in-home.patch ]; - configureFlags = "--datadir=\${out}/share/"; - makeFlags = ["CC=cc"]; + configureFlags = [ "--datadir=\${out}/share/" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with stdenv.lib; { description = "A curses based typing game"; |