| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
This is quite redundant because autoPatchelfHook already scans all
shared objects and executables for dependencies and bails out with an
error if a dependency isn't found, which is similar to what we're doing
in installCheckPhase.
Removing this should also speed up builds, especially those with lots of
files.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
| |
This is quite straightforward and very similar to most other Mono games
and even uses XDG directories already.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
| |
On some occasions a captcha isn't needed for login (not sure exactly
when this is the case), so we really should just log in without it
instead of bailing out with an error.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far we only checked for the source root by checking only one level of
directories, so for example if the source code is unpacked into
something like "a/b/c" and only "c" contains files, the previous
implementation would set the source root to be "a".
In addition we didn't do a check on the type of the contents, so for
example if the archive contains only *one* file, that *file* itself
would be set as the source root and the chdir to that will fail later.
What we do now is recursively search through directories in order to
find the last directory that does not contain *only* a subdirectory.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We only fetch the data files from GOG here and use the port from
OpenPandora (https://repo.openpandora.org/?page=detail&app=albion_sr)
for the main game executable.
Instead of using the binaries of the static recompiler, this is
completely compiled from source and comes with a few changes in the form
of a few patches:
config.patch:
Hide the mouse cursor and set the default scaled resolution to
1280x960 (the window can still be resized) in the default
albion.cfg.
error-log-stderr.patch:
Whenever an error happens, the game usually creates a file called
"error.log", which contains the actual error message. This patch
makes sure the file isn't created but the error message is printed
to stderr.
scons.patch:
Fixes a few SConstruct/SConscript files to use the builder's
environment, so that it can find executables such as gcc.
sdl2.patch:
SDL 2 has dropped support for the keysym.unicode field at some
point, so use keysym.sym instead. This has the disadvantage that it
doesn't recognize key modifiers, so we might want to switch this to
use the SDL_TEXTINPUT event.
xdg-paths.patch:
We want to use XDG_CONFIG_HOME and XDG_DATA_HOME instead of writing
everything to one directory, so this patch makes sure that the paths
are correctly read depending on whether its an XDG directory or one
of the store paths of the game.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We're in almost the same misery here as with HumbleBundle, because we
can't get stable download URLs with manifests for games that have an
"os" field of either "windows" or "osx".
Unfortunately, this isn't the only hoop we're going to, because similar
to the HumbleBundle fetcher, we need to solve a (re)captcha in order to
login (and I've been annoyed by countless cars, street signs, roads,
busses, store fronts, hills and mountains during development).
I tried looking for a way to get an API key similar to what itch.io is
doing, but the only mechanism in place is a temporary key which needs to
be refreshed using the old key after a while, so it's unsuitable for our
case.
The code currently is very much _not_ DRY, because a lot of it is copied
over and modified from fetchHumbleBundle, especially the captcha solving
application.
It's really a shame to see the same situation that we have for
HumbleBundle in GOG, given that HB is getting less DRM-free games these
days and GOG is DRM-free *only* (which is a very good thing).
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is needed in order to correctly display icons if someone doesn't
use a full desktop environment.
I'm not sure why NixOS/nixpkgs@bff6d624e05c53777a9d2fd85872884983f74313
removed this (in particular gnome3.defaultIconTheme, but
hicolor_icon_theme should be enough anyway), but let's re-add it for our
configuration until this is sorted out.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Seems that 543ca6580d6f52d58caf975c0ed583956aa08b39 was not enough to
fix the actual issue, because the real issue was in podcastparser.
The upstream issue is gpodder/gpodder#394 and the pull request fixing
this is gpodder/podcastparser#17.
Instead of just updating podcastparser, I also updated gpodder to latest
master, because it contains a few more fixes.
I've tested whether this fixes my issue and it did (feed items now have
the correct date).
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
| |
A lot has changed since the version I had in here and the current
upstream master, so let's get all the new bugs and features :-)
Here is a comparison with all the commits that have happened since then:
https://github.com/NixOS/nixops/compare/d1907cb1a4defa...eb6d25688a35de
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
| |
Apparently nginx resolves localhost to [::1] in a newer version by defaul, yet
my static file server only binds to 127.0.0.1.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@3a2ee6e5c3bfae64c604859c7cc1ee6b069ea5b5 the
attribute name for the kernel packages is now
linuxPackages_copperhead_hardened instead of
linuxPackages_hardened_copperhead, so we need to change it in our
conditions as well.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
|
| |
I've pushed this with a few improvements to upstream <nixpkgs> via
commit NixOS/nixpkgs@1cba74dfc1541673f91b91c3ab50dbdce43c764a.
The original pull request was NixOS/nixpkgs#34506.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
|
| |
A few attributes weren't re-added to the actual derivation, so for
example whenever we add buildInputs to buildUnity the attribute would be
completely ignored.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
New features:
* New Cerebrus map: Back to the Future
Updates:
* RONIN: Slashed players will incur 0.25s of hard stun / push back, and
0.35s of soft stun
* PROTEUS: Scanner Drone won't continue to shock dead players
* PROTEUS: Next Scanner Drone has a 3s cooldown from the time the last
was destroyed (if shot down)
* CRONUS: Drop target movement speed increased from 0.17s to 0.15s per
tile
* CRONUS: Bomb hit time & lingering fire increased from 1s to 1.5s
* AETHER: Ground pound hit window is active for 0.25s instead of 1
frame
* GAME: Arx-515 teleporters are disabled for 1.25s while being used
* GAME: Reduced visibility time after firing from 0.75s to 0.5s
* GAME: Slightly reduced replay recording memory usage
* GAME: Improved presentation of players visible due to Revealer
powerup
* GAME: Players are snapped to the nearest tile when firing
perpendicular to movement
* GFX: Removed FX when revealer ends, which had the potential to reveal
real Epi's position
* GFX: Clarified readability of some boundaries on Aqueduct
* GFX: Powerup parachute drops are slightly transparent until near the
ground
* UI: Hero Profile demos properly show ability cooldown indicators
Fixes:
* EPI: Fixed cluster shots from ghost Epi breaking shields
* CRONUS: Fixed target disappearing on clients after attempting a drop
over a disallowed area
* CRONUS: Better drop target local simulation and feel for remote
clients
* MAPS: Added missing fence posts around holes on Conundrum
* GAME: Slightly increased physics step rate to prevent some
fast-moving collision misses
* GAME: Fixed bumping builder blocks destruction after the reflection
shield is already gone
* GAME: Fixed potential to get shot in your original spot after
teleporting online
* GFX: Fixed projectile collision visuals' positions due to high-speed
physics
* GFX: Fixed projectile collision visuals' positions on network clients
* GFX: Fixed exported GIF speeds due to vsync differences
* UI: Fixed occasional disappearing in-match pause menu
* UI: Fixed Proteus hero profile demo
* UI: Fixed insane speed when changing controller setup types using
analog sticks
* PREFS: custom config file will no longer be reset during updates
(after this release)
* PREFS: custom config file has option to disable fullscreen FX for
strobe-sensitive players
Full upstream change log:
https://s3-us-west-1.amazonaws.com/sombr-invisigun/messages/ReleaseNotes.txt
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
| |
Very similar to other games using Mono, but this has a similar problem
to what Opus Magnum had (see 523dcef1f77251a4cfeb3428a0b13c0ec1d9c342)
but instead of using Cecil for patching I'm using LD_PRELOAD instead
because the number of occasions we need to patch is not only higher but
also there are different constructors in use for System.IO.FileStream,
so patching becomes much much harder.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
It seems to work again and I need it for teaching.
|
| |
|
|
|
|
|
| |
The battery in this machine is on its way out. Can't afford a new one
though, so let's see if this helps a bit.
|
|
|
|
| |
This is quite neat, so eris should also move to a compton service.
|
|
|
|
|
|
|
| |
I've been using this for a while and got better results than zlib and
lzo, so let's actually use this for all my machines.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Upstream changelog summarized:
* Switch to DirectSound on Windows.
* Remove iron-on patch link.
* The Hexstabilized Salt puzzle now requires 18 outputs instead of 6.
* Add a new journal issue that is entirely production puzzles.
* Add a hidden option that will hopefully fix some of the sound issues
that were introduced when we rewrote our audio backend.
* Add a new issue to the journal with some "battlefield medicine"
themed puzzles.
* The game's content files are now opened as read-only, which should
hopefully fix some of the antivirus-related crashes some players have
been experiencing.
* Atom spawn/consume effects on glyphs are now cleared when the
simulation is stopped, which should fix a bug causing "ghost atoms" to
linger on the board.
I've made this summary by picking the relevant parts of the upstream
Steam announcement page at:
http://steamcommunity.com/games/558990/announcements
The best part about the changes is that content files are now opened
read-only, so we can finally drop all that patching. This also is the
first time I can say something positive about AV software, so thanks for
bugging Zachtronics into fixing this issue for Nix as well :-)
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
| |
0.3 seems a bit extreme for my taste, so I'm hoping 0.2 will be abit
more subtle but still distinguishable.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Get rid of the annoying build error again (see 8be3704c3fbe08308132d92a6
for the last time), but this time for searx 0.13.1.
The main thing that has changed is that instead of hmac.new() there is
now a helper function called new_hmac(), which the patch now uses.
I've also cleaned up some tiny bits reported by flake8 and fixed the
description of SecretAppKeyError to refer to XDG_CACHE_HOME instead of
XDG_CACHE_DIR.
In addition to the updated patch, we now need to add XDG_CACHE_HOME to a
writable directory (in this case $TMPDIR), because otherwise the
test_webapp fails with an SecretAppKeyError, as it will try to create
leading directories to XDG_CACHE_HOME.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Profpatsch
|
|
|
|
|
|
|
|
|
| |
If meta.broken is set to true for a package, we need to return an empty
list. However, "brokenOr" needs to be a function returning a list and
the first branch (meta.broken being true) of the condition just returns
a list instead of a function.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
New tests as of NixOS/nixpkgs@27a4a5511dc2cf9756943458d7a752617e4ad6e3:
acme, atd, beegfs, couchdb, dovecot, env, gitolite, grafana, graphite,
home-assistant, initrd-network-ssh, kernel-copperhead, kernel-latest,
kernel-lts, mesos, mutableUsers, mysqlBackup, netdata, nghttpx,
owncloud, prometheus, radicale, statsd, sudo, switchTest, vault,
xmonad, zookeeper
I've removed the pgjwt test, because the attribute is not reachable
anymore within nixos/release.nix as it has been commented out in
NixOS/nixpkgs@40ed22650737a444fee7883e69e852fd4b808133.
Also I didn't add the postgis test, because checking for the
configuration attribute is a bit tedious and chances are very low that
we'd have a machine in Vuizvui that uses it.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
While we now evaluate broken packages and they fail to build, this is
still not very nice because it will still break the generic channel.
So let's do this a bit differently and actually exclude these packages
without running into an eval error. We evaluate the derivation and later
check whether meta.broken is set, which has the advantage that we only
kick out packages that are *directly* marked as broken rather than
excluding packages that have a broken flag in one of their dependencies.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Profpatsch
|
|
|
|
|
|
|
|
|
|
| |
Just because a package is marked as broken doesn't necessarily mean it's
broken. For openlab.gitit this might still be the case, but having this
result in an eval error isn't very nice, so we'd rather just have this
boil down to a broken build instead.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Profpatsch
|
|
|
|
|
|
|
|
|
| |
This reverts commit dfd3d86562f09d812b330893cec053ab3d371bdf.
The machine is back on NixOS again :-)
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @brokkoliberta
|
|
|
|
|
|
|
|
|
|
|
| |
This is mainly to get gpodder/gpodder@c937184987431427dfcf8ac9bc098ce0ac
but there are other fixes in the current master version, so instead of
just patching the single fix, I'm heading for master directly instead.
I've also added an assertion on the version attribute so that whenever
there is a new upstream version, we can revert this.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
| |
In order to do integer comparisons on the Nix version, we need to
zero-pad the minor version, so that we always have two digits.
Since the change of Nix version 1.12 to 2.0 the minor version no longer
has two digits, so we get 20 instead of 112 and when compared the former
is smaller than the latter but it has to be the opposite.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
| |
We certainly don't want the builder to succeed if we're missing a
dependency, so let's make sure the build is aborted (due to set -e)
whenever that happens.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
| |
Having a function in autoPatchelfHook that's unused inside the setup
hook is a bit of weird, because the actual usage is within buildGame and
thus it should stay there for now.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
| |
This is really not game-specific, so let's put it at the top-level and
also make sure we substitute all the commands we're using there, even
though a few of them are in PATH of stdenv so that it will always work
even when the programs available in stdenv should change someday.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far we only matched the file name of the dependency but not its
architecture, so if for example there is one shared object for
i686-linux and another one with the same name but for x86_64-linux,
chances are that the wrong architecture is chosen.
Now we're checking the architecture of the shared object file and only
pick it, if it matches the architecture of the file to patchelf.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
| |
We're using "out_to_x = false" because we only want output to stdout,
unfortunately since conky version 1.10.7, this causes a segfault which
is tracked in upstream issue brndnmtthws/conky#454.
The patch I'm using here was submitted and merged upstream in
brndnmtthws/conky#455 and it's not yet part of a release yet.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
| |
This makes sure that ldd doesn't print warnings like if the file isn't
executable and also makes the status messages a bit more clear.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The semantics of adding env hooks has changed in
NixOS/nixpkgs@7f3ca3e21a22fd3101b40cadb86899542dec2e35 so that it's now
broken up into several hook variables (envBuildBuildHook,
envBuildHostHook, envBuildTargetHook, envHostHostHook, envHostTargetHook
and envTargetTargetHook).
Fortunately commit NixOS/nixpkgs@a036473a0a0c6100fce316e1444fc33ec6674b
adds a helper function (addEnvHooks) to deal this without referencing
those hook variables directly and rather just providing an offset.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We don't want this little helper to leave all kinds of junk on the disk,
so let's enable offTheRecord mode for the default QtWebEngine profile.
This in turn causes all stuff like cache, cookies, local storage and
whatnot to only reside in memory.
For example on my machine I had lots of files like this in
~/.local/share and ~/.cache:
* 014bxyklf1xm99jd5rg8y4q0blmqw6yc-get-captcha
* 18j0knrwrsamsrpwjz741midspxbqmpp-get-captcha
* 4817rvjnj249ifvk7dsvv2p0kxi2jwkg-get-captcha
So if you ran this helper you should probably remove *-get-captcha in
XDG_DATA_HOME (by default ~/.local/share) and XDG_CACHE_HOME (by default
~/.cache).
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Profpatsch, @Sternenseemann, @layus
|
|
|
|
| |
For good measure, add pixz to the parallel compression collection.
|
|
|
|
|
|
| |
I'm spending too much time at Uni and dnscrypt will not work properly in
this network and is causing lookup timeouts, so I'm going to have to
disable it until I find a solution.
|