diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-06-17 13:23:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-06-17 13:23:39 +0200 |
| commit | d88c0cf8678c7accbd95010bb20ea0812a48bac5 (patch) | |
| tree | 8c14f084b42a1b2e3060f2b25aadc68906ba76d2 /pkgs/games | |
| parent | 0d4431cfe90b2242723ccb1ccc90714f2f68a609 (diff) | |
| parent | 230c0d461a7941c770f358e2b0829fe344953027 (diff) | |
| download | nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.gz nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.bz2 nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.lz nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.xz nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.tar.zst nixlib-d88c0cf8678c7accbd95010bb20ea0812a48bac5.zip | |
Merge #26628: treewide: setuid/setgid fallout
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/unnethack/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/xconq/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/xsokoban/default.nix | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index ae32de2e7716..ea0186323c02 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "--with-gamesdir=/tmp/unnethack" ]; + makeFlags = [ "GAMEPERM=744" ]; + postInstall = '' cp -r /tmp/unnethack $out/share/unnethack/profile mv $out/bin/unnethack $out/bin/.wrapped_unnethack diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index e6e237529531..e8e27d7afb66 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { # Fix Makefiles find . -name 'Makefile.in' -exec sed -re 's@^ ( *)(cd|[&][&])@ \1\2@' -i '{}' ';' find . -name 'Makefile.in' -exec sed -e '/chown/d; /chgrp/d' -i '{}' ';' + # do not set sticky bit in nix store + find . -name 'Makefile.in' -exec sed -e 's/04755/755/g' -i '{}' ';' sed -e '/^ * *[$][(]tcltkdir[)]\/[*][.][*]/d' -i tcltk/Makefile.in # Fix C files diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 47d05b7e3f6a..814241244e31 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + prePatch = '' + substituteInPlace Makefile.in --replace 4755 0755 + ''; + preConfigure = '' sed -e 's/getline/my_getline/' -i score.c @@ -22,7 +26,7 @@ stdenv.mkDerivation rec { cat >>config.h <<EOF #define HERE "@nixos-packaged" #define WWW 0 - #define OWNER "'$(whoami)'" + #define OWNER "$(whoami)" #define ROOTDIR "$out/lib/xsokoban" #define ANYLEVEL 1 #define SCOREFILE ".xsokoban-score" |