diff options
author | Zhong Jianxin <azuwis@gmail.com> | 2023-11-30 20:14:00 +0800 |
---|---|---|
committer | Zhong Jianxin <azuwis@gmail.com> | 2023-11-30 20:14:00 +0800 |
commit | be94fe030857a967e745b4ad261697b62316c59f (patch) | |
tree | a6517bdcfd74aa02a62a983558f05bf26df9dfba | |
parent | 3f21a22b5aafefa1845dec6f4a378a8f53d8681c (diff) | |
download | nixlib-be94fe030857a967e745b4ad261697b62316c59f.tar nixlib-be94fe030857a967e745b4ad261697b62316c59f.tar.gz nixlib-be94fe030857a967e745b4ad261697b62316c59f.tar.bz2 nixlib-be94fe030857a967e745b4ad261697b62316c59f.tar.lz nixlib-be94fe030857a967e745b4ad261697b62316c59f.tar.xz nixlib-be94fe030857a967e745b4ad261697b62316c59f.tar.zst nixlib-be94fe030857a967e745b4ad261697b62316c59f.zip |
trigger-control: unstable-2023-06-18 -> 1.5.1
Also fix build on darwin/clang
-rw-r--r-- | pkgs/by-name/tr/trigger-control/package.nix (renamed from pkgs/tools/games/trigger-control/default.nix) | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/tools/games/trigger-control/default.nix b/pkgs/by-name/tr/trigger-control/package.nix index 0d1ef9ef1d47..b0a389e29ec4 100644 --- a/pkgs/tools/games/trigger-control/default.nix +++ b/pkgs/by-name/tr/trigger-control/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , makeWrapper , pkg-config @@ -16,15 +17,17 @@ let inherit (gnome) zenity; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trigger-control"; - version = "unstable-2023-06-18"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Etaash-mathamsetty"; repo = "trigger-control"; - rev = "d457ebd9e0844cfc456bfa4fa4bb694bb8ad982a"; - hash = "sha256-QWhUQ8xqS8oRVF0KUpEthlrOoXmhcfEkIHauDI1/5a8="; + # upstream does not use consistant tags pattern, so we use git commit hash + # https://github.com/Etaash-mathamsetty/trigger-control/tags + rev = "7b46e743227830d3a97720067d0a6cf20133af90"; + hash = "sha256-nWSvsgksZ4Cxy1+i0xy8pNalgsiAuaqxNVwT/CThaBI="; }; nativeBuildInputs = [ @@ -41,6 +44,15 @@ stdenv.mkDerivation rec { libdecor ]; + patches = [ + # Fix build on clang https://github.com/Etaash-mathamsetty/trigger-control/pull/23 + (fetchpatch { + name = "clang.patch"; + url = "https://github.com/Etaash-mathamsetty/trigger-control/commit/bbec33296fdac7e2ca0398ae19ca8de8ad883407.patch"; + hash = "sha256-x6RymdzBlzAJ8O8QGqXQtvkZkjdTaC5X8syFPunqZik="; + }) + ]; + # The app crashes without a changed fontdir and upstream recommends dejavu as font postPatch = '' substituteInPlace trigger-control.cpp --replace "/usr/share/fonts/" "${dejavu_fonts}/share/fonts/" @@ -63,7 +75,8 @@ stdenv.mkDerivation rec { description = "Control the dualsense's triggers on Linux (and Windows) with a gui and C++ api"; homepage = "https://github.com/Etaash-mathamsetty/trigger-control"; license = licenses.mit; + mainProgram = "trigger-control"; maintainers = with maintainers; [ azuwis ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6934627702a0..c91dc36b6cbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2087,8 +2087,6 @@ with pkgs; transmission-rss = callPackage ../tools/networking/transmission-rss { }; - trigger-control = callPackage ../tools/games/trigger-control { }; - trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; }; ttchat = callPackage ../tools/misc/ttchat { }; |