Merge pull request #34706 from P-E-Meunier/xjump

Xjump: init at 2.9.3
This commit is contained in:
Michael Raskin 2018-02-20 09:57:29 +00:00 committed by GitHub
commit e46553bc72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 0 deletions

View file

@ -0,0 +1,21 @@
--- xjump/src/main.c 2018-02-20 09:15:15.608807657 +0100
+++ xjump-patched/src/main.c 2018-02-20 09:15:34.148949100 +0100
@@ -604,18 +604,6 @@
* optimistic privilege dropping function. */
setgroups(0, NULL);
- if (setresgid(-1, realgid, realgid) != 0) {
- perror("Could not drop setgid privileges. Aborting.");
- exit(1);
- }
-
- /* Dropping user privileges must come last.
- * Otherwise we won't be able to drop group privileges anymore */
- if (setresuid(-1, realuid, realuid) != 0) {
- perror("Could not drop setuid privileges. Aborting.");
- exit(1);
- }
-
/* From now on we run with regular user privileges */
static XtActionsRec a_table[] = {

View file

@ -0,0 +1,27 @@
{ stdenv, buildPlatform, fetchFromGitHub, autoconf, automake, libX11, libXt, libXpm, libXaw, localStateDir?null }:
stdenv.mkDerivation rec {
name = "xjump-${version}";
version = "2.9.3";
src = fetchFromGitHub {
owner = "hugomg";
repo = "xjump";
rev = "e7f20fb8c2c456bed70abb046c1a966462192b80";
sha256 = "0hq4739cvi5a47pxdc0wwkj2lmlqbf1xigq0v85qs5bq3ixmq2f7";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ libX11 libXt libXpm libXaw ];
preConfigure = "autoreconf --install";
patches = if buildPlatform.isDarwin then [ ./darwin.patch ] else [];
configureFlags =
if localStateDir != null then
["--localstatedir=${localStateDir}"]
else
[];
meta = with stdenv.lib; {
description = "The falling tower game";
license = licenses.gpl2;
maintainers = with maintainers; [ pmeunier ];
};
}

View file

@ -19037,6 +19037,7 @@ with pkgs;
tk = tk-8_5;
};
xjump = callPackage ../games/xjump { };
# TODO: the corresponding nix file is missing
# xracer = callPackage ../games/xracer { };