diff options
author | Kira Bruneau <kira.bruneau@pm.me> | 2023-12-07 08:53:42 -0500 |
---|---|---|
committer | Kira Bruneau <kira.bruneau@pm.me> | 2023-12-27 08:55:22 -0500 |
commit | 30a6b77c41d30c65ec9a91e658fea8da7bdd2480 (patch) | |
tree | 35e43073ec1c0574d82bea5068b01cb3eeed19bc /pkgs/tools/games | |
parent | d4aa883213e2ac0f3f470820c024549f6ebde693 (diff) | |
download | nixlib-30a6b77c41d30c65ec9a91e658fea8da7bdd2480.tar nixlib-30a6b77c41d30c65ec9a91e658fea8da7bdd2480.tar.gz nixlib-30a6b77c41d30c65ec9a91e658fea8da7bdd2480.tar.bz2 nixlib-30a6b77c41d30c65ec9a91e658fea8da7bdd2480.tar.lz nixlib-30a6b77c41d30c65ec9a91e658fea8da7bdd2480.tar.xz nixlib-30a6b77c41d30c65ec9a91e658fea8da7bdd2480.tar.zst nixlib-30a6b77c41d30c65ec9a91e658fea8da7bdd2480.zip |
gamemode: 1.7 -> 1.8.1
https://github.com/FeralInteractive/gamemode/blob/1.8.1/CHANGELOG.md
Diffstat (limited to 'pkgs/tools/games')
-rw-r--r-- | pkgs/tools/games/gamemode/default.nix | 35 | ||||
-rw-r--r-- | pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch | 16 | ||||
-rw-r--r-- | pkgs/tools/games/gamemode/preload-nix-workaround.patch | 2 |
3 files changed, 13 insertions, 40 deletions
diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 2b9c51d86285..928b9233bccd 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , libgamemode32 +, makeWrapper , meson , ninja , pkg-config @@ -10,7 +10,6 @@ , inih , systemd , appstream -, makeWrapper , findutils , gawk , procps @@ -19,28 +18,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "gamemode"; - version = "1.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "FeralInteractive"; repo = "gamemode"; rev = "refs/tags/${finalAttrs.version}"; - sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; + hash = "sha256-kusb58nGxYA3U9GbZdW3hLjA3NmHc+af0VT4iGRewBw="; }; - outputs = [ "out" "dev" "lib" "man" "static" ]; + outputs = [ "out" "dev" "lib" "man" ]; patches = [ # Add @libraryPath@ template variable to fix loading the PRELOAD library ./preload-nix-workaround.patch - # Do not install systemd sysusers configuration - ./no-install-systemd-sysusers.patch - - # fix build with glibc >=2.36 (declaration of pidfd_open) - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/4934191b1928ef695c3e8af21e75781f8591745f.patch"; - sha256 = "sha256-pWf2NGbd3gEJFwVP/EIJRbTD29V7keTQHy388enktsY="; - }) ]; postPatch = '' @@ -67,12 +58,15 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - # libexec is just a way to package binaries without including them - # in PATH. It doesn't make sense to install them to $lib - # (the default behaviour in the meson hook). - "--libexecdir=${placeholder "out"}/libexec" - + "-Dwith-pam-limits-dir=etc/security/limits.d" "-Dwith-systemd-user-unit-dir=lib/systemd/user" + "-Dwith-systemd-group-dir=lib/sysusers.d" + + # The meson builder installs internal executables to $lib/lib by + # default, but they should be installed to "$out". It's also more + # appropriate to install these executables under a libexec + # directory instead of lib. + "--libexecdir=libexec" ]; doCheck = true; @@ -80,11 +74,6 @@ stdenv.mkDerivation (finalAttrs: { appstream ]; - # Move static libraries to $static so $lib only contains dynamic libraries. - postInstall = '' - moveToOutput lib/*.a "$static" - ''; - postFixup = '' # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since # they use dlopen to load libgamemode. Can't use makeWrapper since diff --git a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch deleted file mode 100644 index 27aa1d4d710c..000000000000 --- a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git i/data/meson.build w/data/meson.build -index 6fb82d8..2e9e170 100644 ---- i/data/meson.build -+++ w/data/meson.build -@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd' - configuration: data_conf, - install_dir: path_systemd_unit_dir, - ) -- # Install the sysusers.d file -- install_data( -- files('gamemode.conf'), -- install_dir: path_systemd_sysusers_dir, -- ) - endif - - # Install the D-BUS service file diff --git a/pkgs/tools/games/gamemode/preload-nix-workaround.patch b/pkgs/tools/games/gamemode/preload-nix-workaround.patch index 9c8db37f5d91..06989ff984ab 100644 --- a/pkgs/tools/games/gamemode/preload-nix-workaround.patch +++ b/pkgs/tools/games/gamemode/preload-nix-workaround.patch @@ -6,7 +6,7 @@ index 573b3e4..6f2799e 100755 # ld will find the right path to load the library, including for 32-bit apps. LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}" -+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ++LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -exec env LD_PRELOAD="${LD_PRELOAD}" $GAMEMODERUNEXEC "$@" +exec env LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" $GAMEMODERUNEXEC "$@" |