2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-22 13:43:22 +00:00
Commit Graph

32 Commits

Author SHA1 Message Date
Felix Buehler
4226cedf26 uqm-3dovideo: switch to fetchFromGitHub 2021-09-22 17:56:02 +02:00
aszlig
2f30e32121
uqm: Fix evaluation of 3DO video package
Regression introduced by 2e34288f0d.

The commit in question just used the "lib" attribute, but it wasn't in
scope. In addition to bringeng the lib attribute into scope, I also
removed the "with lib;", which should make sure that we get an error
when just parsing (nix-instantiate --parse) the Nix expression.

Signed-off-by: aszlig <aszlig@nix.build>
2021-01-24 15:35:33 +01:00
Ben Siraphob
bd42003f87 pkgs/games: pkg-config -> pkgconfig (2) 2021-01-16 23:49:59 -08:00
Ben Siraphob
2e34288f0d pkgs/games: stdenv.lib -> lib 2021-01-15 13:36:04 +07:00
aszlig
948d828955
uqm: Fix purity checking error during config phase
Since commit fb777be7d2, linking programs
in /tmp will no longer work, since with this commit (hardcoded) /tmp
will no longer be treated a valid temporary directory by the purity
checking logic.

Essentially what that logic does is checking whether the link target is
either relative, in some temporary directory or in the Nix store and if
that's not the case, an error is thrown like in this case:

  gcc -c /tmp/build.24.tmp.c -o /tmp/build.24.tmp.c.o
  gcc /tmp/build.24.tmp.c.o -o /tmp/build.24.tmp.out
  impure path `/tmp/build.24.tmp.out' used in link
  collect2: error: ld returned 1 exit status

Note here, that $TMP and $TMPDIR point to /build while the output here
still refers to /tmp. This is because the custom build system of uqm
simply hardcodes /tmp and doesn't honor any of these variables.

To fix this, all we need to do is the latter and we're now using $TMPDIR
instead of /tmp for these compile-tests during configure.

While the pull request[1] introducing said commit has a few comments
regarding other issues and it could still be either reverted or changed,
using $TMPDIR in the uqm build script is entirely backwards-compatible
and shouldn't hurt in any case.

[1]: https://github.com/NixOS/nixpkgs/pull/93560

Signed-off-by: aszlig <aszlig@nix.build>
2020-09-18 12:33:03 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00: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
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Anders Kaseorg
6f073154da Give working advice for running nix-prefetch-url
nix-prefetch-url file://… requires a full path.  Suggest an invocation
that will provide one.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-03-04 17:28:36 +00:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
aszlig
b9b5942e2b
uqm: Remove the -lgcc_s hack
This is no longer needed and I've verified this by building and running
the game.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:57 +01:00
aszlig
7603da33de
uqm: Fix build against glibc 2.26
I've bisected the introduction of the build failure to be the glibc 2.26
upgrade with commit 9bb67d5c1e.

At first I was somewhat stumped why an glibc update could cause
undeclared identifiers, but after looking at the changes of glibc and
the source code of The Ur-Quan Masters the problem quickly turned out to
be this very change:

https://sourceware.org/git/?p=glibc.git;a=commit;h=7b037c095e31c2396d0a9b0e6356bc566ee4812f

So string.h now in turn includes strings.h, which in theory wouldn't be
a problem.

However, both strings.h and the strings.h in the uqm source code use
constant _STRINGS_H, which causes the glibc strings.h to be included but
the one from uqm basically includes an empty file.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-08 06:48:15 +01:00
aszlig
3429d8cbbf
uqm: Clean up package expression style
The only functional change here is that I've dropped unzip, because that
dependency doesn't seem to be necessary at all. Despite the broken build
state I've tried building and running The Ur-Quan Masters with an older
nixpkgs revision and it works fine.

Other than that there are no references in the source code for unzip
except in the binary installer and some of the INSTALL files.

The reason why I'm removing the "with pkgs.lib;" is that it makes it
easier to quickly check for errors with "nix-instantiate --parse".

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jcumming
2017-11-08 05:55:35 +01: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
zimbatm
4d545297d8 lib: introduce imap0, imap1 ()
* lib: introduce imap0, imap1

For historical reasons, imap starts counting at 1 and it's not
consistent with the rest of the lib.

So for now we split imap into imap0 that starts counting at zero and
imap1 that starts counting at 1. And imap is marked as deprecated.

See c71e2d4235 (commitcomment-21873221)

* replace uses of lib.imap

* lib: move imap to deprecated.nix
2017-07-04 23:29:23 +01:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
aszlig
c7e7f12ef6
uqm: Bring back package and fix 3do extractor.
It was dropped in 324719a5a6.

The UQM package itself doesn't require Haskell, but in order to extract
contents from the 3do version of the game, we need to have a small
helper utility which I wrote in Haskell a while ago. In order to switch
it to Haskell NG, only very minor modifications were necessary, which
are now done with this commit instead of dropping the whole game.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-07 08:03:06 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig
e76a755517
uqm: Add myself to the maintainers list.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-15 10:43:39 +02:00
aszlig
3fbd3a025d
uqm: Symlink addons and packages.
Copying these over to the output path of the main derivation will just
unnecessarily blow up the size of it with files we already have in the
store anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-15 10:43:39 +02:00
aszlig
80673a70e7
uqm: Add an option to use the remix packs.
The remix packs are a collection of newly remixed versions of the
old music from the PC/3DO versions. By using useRemixPacks these are
fetched as well and added to the game.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-15 10:43:39 +02:00
aszlig
5b421a86f6
uqm: Convert base16 SHA256 hashes to base32.
We want to have shorter SHAs, don't we? :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-15 10:43:39 +02:00
aszlig
7e2587561d
uqm: Switch to using fetchurl for uqm3donix.
As we now have a tagged first release, it really doesn't make sense to
introduce additional dependencies by using fetchgit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-15 10:43:38 +02:00
aszlig
4f62f1603a
uqm: Update video extractor to latest Git version.
This updates the 3DO video extractor to the latest Git version, which
should fix a too restrictive dependency on base which leads to it not
compiling with current nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-14 20:50:58 +02:00
aszlig
1aa68dd29f
uqm: Include optional support for 3DO videos.
This is optional because you have to have an image of a Star Control II 3DO CD
image. I decided to hack together a small OperaFS (that's the proprietary
filesystem used with 3DO CD-ROMs) file extractor, which should possibly make
it as painless as possible to include those videos.

It may be a good idea to split off the haskell package into another attribute
set (possibly haskellPackages?), but I really don't think there is a need for
that, because it's really just UQM and 3DO specific.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-16 21:03:07 +02:00
Eelco Dolstra
7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Jack Cummings
18d4a832b0 - clean up openttd, rili, uqm, and widelands descriptions 2012-10-05 09:36:36 -07:00
Jack Cummings
27ec277359 - add myself as a maintainer for the packages I've added 2012-10-04 23:39:00 -07:00
Jack Cummings
22ece175a0 - openttd 1.2.2, rili 2.0.1, widelands-build17, uqm-0.7.0 2012-10-04 23:32:34 -07:00