diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
commit | ea2acbed493e218f696673a004a95829392c5e33 (patch) | |
tree | c5716552f205bbf4d4addfa4675ea5073786bd06 /nixpkgs/pkgs/applications/misc/syncthingtray/default.nix | |
parent | 06ba6c84f858b011fb1132721e5d5e28fcda4a8a (diff) | |
parent | 8aa8cd68f4745eb92f003666bfd300f3e67cd9c1 (diff) | |
download | nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.gz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.bz2 nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.lz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.xz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.zst nixlib-ea2acbed493e218f696673a004a95829392c5e33.zip |
Merge branch 'staging' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/syncthingtray/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/syncthingtray/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 627f09979638..c464fddcc702 100644 --- a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -11,6 +11,7 @@ , qtutilities , qtforkawesome , boost +, wrapQtAppsHook , cmake , kio , plasma-framework @@ -29,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ , autostartExecPath ? "syncthingtray" }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.4.6"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/HAqO0eVFt4YLGeTbZSZcH2pOojvykukAGTBHZTfKLQ="; }; @@ -54,6 +55,7 @@ mkDerivation rec { ; nativeBuildInputs = [ + wrapQtAppsHook cmake qttools ] @@ -64,7 +66,7 @@ mkDerivation rec { # Don't test on Darwin because output is .app doInstallCheck = !stdenv.isDarwin; installCheckPhase = '' - $out/bin/syncthingtray --help | grep ${version} + $out/bin/syncthingtray --help | grep ${finalAttrs.version} ''; cmakeFlags = [ @@ -85,4 +87,4 @@ mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) |