2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 10:12:58 +00:00
Commit Graph

35 Commits

Author SHA1 Message Date
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Sergei Trofimovich
af9d2c68b7 warsow-engine: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: CMakeFiles/wswtv_server.dir/__/unix/unix_time.c.o:(.bss+0x8): multiple definition of
      `c_pointcontents'; CMakeFiles/wswtv_server.dir/__/null/ascript_null.c.o:(.bss+0x8): first defined here
2022-06-03 07:07:25 +01:00
Naïm Favier
9160044f5f
treewide/makeWrapper: replace --run cd with --chdir
Lay the groundwork for switching to binary wrappers by reducing uses
of `--run` (which is not supported by `makeBinaryWrapper`).
2022-03-19 09:46:31 +01:00
Jan Tojnar
4d8ea30a4f
warsow: clean up
- Do not contaminate builder environment with libraries, substitute them in the patch directly.
- Switch to pname from name.
- Run installPhase hooks.
- Correct license.
2021-02-25 10:12:46 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
github-actions[bot]
0e4e47512d
Merge master into staging-next 2021-01-05 00:56:58 +00:00
Marc 'risson' Schmitt
559cf76fa3
warsow: fix src url
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
2021-01-04 20:02:23 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Marek Mahut
e79212611e warsow: mark as broken on aarch64 2019-08-21 15:02:36 +02:00
Pierre Bourdon
fe3dca6e73
warsow,warsow-engine: fix mirror URL
Current one does not resolve. New one is the one currently present on
warsow.net.
2019-08-21 12:27:20 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) ()
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Nikolay Amiantov
28264de9fc warsow: add missing patch 2018-03-13 01:11:56 +03:00
Nikolay Amiantov
5ed883a40b warsow: 1.03 -> 2.1.2
Fix build, split into engine and game to build engine on Hydra.
2018-03-13 01:08:50 +03:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
zimbatm
38cc58896c warsow: mark as broken
libjpeg62 is broken as well
2017-01-24 16:16:47 +00:00
Tuomas Tynkkynen
b56b24f729 treewide: Mass replace 'freetype}/lib' to refer the 'out' output 2016-01-24 10:03:34 +02:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Александр Цамутали
4cb80bdb1e warsow: Fix for ui module downloaded from server. 2013-02-12 01:02:19 +04:00
Александр Цамутали
9bd4d4e8a4 warsow: Update to 1.03. 2013-02-07 03:37:50 +04:00
Alexander Tsamutali
bfa2cbe55e games/warsow: Updated to 1.02. 2012-12-01 02:27:47 +03:00
Александр Цамутали
400db72f1d games/warsow: Updated to 1.0. 2012-09-24 02:27:34 +04:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Alexander Tsamutali
4fc6fa03c5 games/warsow: Updated to 0.62.
svn path=/nixpkgs/trunk/; revision=27078
2011-05-01 23:26:51 +00:00
Alexander Tsamutali
617b1fc62e games/warsow: Updated to 0.61.
svn path=/nixpkgs/trunk/; revision=26946
2011-04-24 12:09:33 +00:00
Alexander Tsamutali
a5d31be527 games/warsow: Fixed OpenAL support.
svn path=/nixpkgs/trunk/; revision=25353
2011-01-02 23:52:25 +00:00
Alexander Tsamutali
51282e4a98 games/warsow: Updated to 0.6.
svn path=/nixpkgs/trunk/; revision=25352
2011-01-02 23:36:25 +00:00
Alexander Tsamutali
c68b4a9297 pkgs/games/warsow: Now mesa will be added to RPATH. Small cleanup.
svn path=/nixpkgs/trunk/; revision=20935
2010-04-03 23:01:36 +00:00
Alexander Tsamutali
286e57b783 games/warsow: New package.
svn path=/nixpkgs/trunk/; revision=19718
2010-01-27 22:22:35 +00:00