| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
New features:
* New hero: Cronus
* New planet: Cerebrus (Kickstarter Cartographers' designs)
* New Cerebrus map: Temple Garden
* New Cerebrus map: Triple Trouble
* New Cerebrus map: The Four Seasons
* New Cerebrus map: Aqueduct
* New Cerebrus map: Ice Prison
* New Cerebrus map: Cold Storage
* New Cerebrus map: The Conundrum
* Localization: Spanish (Latin American, ES-419)
Updates:
* UI: Added ability to change the game mode in the post-match menu
* UI: Improved map thumbnails (reflects game-lighting)
* UI: Time-based game modes modifier increment changed from 10s to 5s
* UI: Changed UI title font to support more localization glyphs
* GFX: Cluster bombs match their owner's color
Fixes:
* UI: Fixed "FREE" resolution setting in windowed mode always reverting
back to fixed sizes
* UI: Fixed resolution / bluriness when using Alt+Enter to toggle
fullscreen
Full upstream change log:
https://s3-us-west-1.amazonaws.com/sombr-invisigun/messages/ReleaseNotes.txt
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The wine-no-unixfs.patch doesn't apply anymore, so we need to get a
newer version of the patch now from http://achurch.org/patch-pile/,
which is a bit different in that it adds --disable-unixfs as a flag to
configure. We don't have autoreconfHook in nativeBuildInputs, so that
flag will simply be ignored but unixfs will be disabled regardless
because the flag in config.h.in is ENABLE_UNIXFS and it's not defined by
default. The reason why I still added it to configureFlags is to prevent
enabling it by accident if autoreconfHook should be part of the wine
derivation in upstream <nixpkgs>.
In addition to that I've made disabling getuid a bit more clear and with
a comment about why we need to disable it.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Instead of just running compton when i3 starts, we'll try to run it as
an actual service here.
|
|
|
|
| |
Blessed be thy name taskwarrior. I shall add your brother/sister.
|
| |
|
|
|
|
| |
This is actually qute handy for timing exams.
|
| |
|
|
|
|
|
|
|
| |
This one is no longer required and the syntax and indent files are
already part of Vim since version 7.4.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
| |
Better than `feh` I hope. Also, vim bindings.
|
|
|
|
|
| |
This battery is getting old, and leaving the max charge at 80 just isn't
cutting it anymore.
|
|
|
|
|
| |
The option `enableKVM` has been deprecated in favor of defining the qemu
package to use instead.
|
|
|
|
| |
This is necessary for `adb` to stop complaining.
|
|
|
|
|
|
|
| |
This reverts commit 6edeead10bcabbd86cf499589f1b1911e0ccd2f2.
Nope, can't do this. I still need VBox for uni work as it's part of a
series of lectures I have to give.
|
|
|
|
| |
Hydra has some issues with this, so disabling again for now.
|
|
|
|
|
|
| |
Openstack has been removed from nixpkgs (see PR #32637). Hydra's eval is
failing because of this, so we should probably remove the tests here
too.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Upstream URL: http://www.zachtronics.com/opus-magnum/
For this I've ripped apart all of the bundled shared objects including
Mono itself, so we're using Mono from <nixpkgs> instead of the provided
one.
In addition to that I had to patch the intermediate language because the
game really doesn't cope very well when the data files are read-only,
which is the case in the Nix store.
Instead of replacing the CIL, I could have used an LD preloader as well,
but I think this is way less error-prone even though we had to patch a
few internal classes where we couldn't match the name properly.
Compared to this an LD preloader would involve patching several symbols
and also implement some logic to distinguish between files read from the
data directory and files read/written to XDG_DATA_HOME.
The reason why I added $HOME/Desktop to the required sandbox paths is
because the game saves gif images into that directory.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
| |
Tyree is dead, no further comment...
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @brokkoliberta
|
|
|
|
|
|
|
| |
I'm using Firefox now and also having a label which only says "Browser"
is a bit more browser-agnostic.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
| |
I no longer use Chromium on a regular basis, so let's open URLs in
Firefox instead.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
| |
DNSCrypt doesn't cope well with Uni's network configuration. We need
Google nameservers so dnscrypt can fetch its information. Meh.
|
|
|
|
|
|
|
|
|
|
|
|
| |
For example if you have something like cabal2nix as a lazy package,
using "cabal2nix --shell . > default.nix" will result in the store path
of cabal2nix being present in the resulting default.nix as the first
line.
We obviously do not want that, so let's redirect stdout of nix-store -r
to /dev/null.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
| |
One of many attempt to follow in making the code more readable and DRY
if possible.
|
|
|
|
|
| |
I find myself turning this on manually more and more, so might as well
turn it on automatically.
|
|
|
|
| |
I'll need some docker love for a bit, so here it is.
|
| |
|
|
|
|
|
|
|
| |
DNSCrypt is pretty cool so far, but networkd is using the nameservers
adviertised through DHCP on respective interfaces which defeats the
point of DNSCrypt a bit. So, unfortunately we'll have to work around it
this way.
|
|
|
|
|
|
|
| |
The patch for <= 4.14 no longer applies, because elevator_get() now has
an additional argument.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
| |
Though we're already checking the realpath() let's actually make sure
that the path begins with a slash, otherwise we'll run into a segfault
later when we try to access the second byte of path.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We only handle XDG_DATA_HOME and XDG_CONFIG_HOME, but we've missed
XDG_CACHE_HOME. While the latter is used very rarely as it doesn't
matter a lot if it ends up within a tmpfs anyway. However if the cache
directory gets pretty large we might run out of space.
Not only do we now have proper fallbacks but this also adds tests for
all of the XDG environment variables we're using.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
|
| |
In 38d3fe573f4d0ad2115eaca71a0b8f67fd01a580 we have moved the sandbox
builder to the top-level vuizvui namespace so we no longer need to do
weird workarounds by providing an empty game configuration.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
| |
I'll move eris over to the same setup titan has now as it has been
working like a charm. At some point I'll eliminate network-manager here
too.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
While we already have support for mounting plain files, this is done on
a very specific basis, mainly the .Xauthority file.
Whenever we use bind_mount() and the file is a regular file, mounting
that file will fail. So let's actually do a stat on the file and decide
whether we want to do bind_file() or bind_mount().
I've stumbled on this because one of the store paths of the run time
dependency graph was a plain file and thus the sandbox wrapper was
unable to mount it.
Signed-off-by: aszlig <aszlig@nix.build>
|
|
|
|
|
|
|
| |
This is not only useful for packaging games, so let's make it available
from the vuizvui scope, so we can use it from other packages as well.
Signed-off-by: aszlig <aszlig@nix.build>
|
| |
|
|
|
|
|
|
|
| |
Apart from using the go compiler, switch from `nix-shell -p`, which only worked
in certain cases, to a `nix-build` with fallback for `man` and default outputs.
Thanks to @muesli for the golang intro.
|
|
|
|
|
| |
It seems that dnscrypt is working, so for now I'll remove Google's
nameservers.
|