about summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorGuillaume Girol <symphorien@users.noreply.github.com>2024-02-16 22:14:58 +0100
committerGitHub <noreply@github.com>2024-02-16 22:14:58 +0100
commit5ec215f2166bd74022d43257dde7da90acca48d7 (patch)
treee212d4f761762e980b1c3ea6ababc7724e0531e5 /pkgs/tools/filesystems
parent1d1f1553a842d2062104e313bdf3eadd4e7f16db (diff)
parent89f5f4ab774f08bc5b677e7ad5687f477822b96a (diff)
downloadnixlib-5ec215f2166bd74022d43257dde7da90acca48d7.tar
nixlib-5ec215f2166bd74022d43257dde7da90acca48d7.tar.gz
nixlib-5ec215f2166bd74022d43257dde7da90acca48d7.tar.bz2
nixlib-5ec215f2166bd74022d43257dde7da90acca48d7.tar.lz
nixlib-5ec215f2166bd74022d43257dde7da90acca48d7.tar.xz
nixlib-5ec215f2166bd74022d43257dde7da90acca48d7.tar.zst
nixlib-5ec215f2166bd74022d43257dde7da90acca48d7.zip
Merge pull request #288153 from acuteaura/patch-2
kdiskmark: 3.0.0 -> 3.1.4
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/kdiskmark/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix
index 200705098409..fd6281a43ab6 100644
--- a/pkgs/tools/filesystems/kdiskmark/default.nix
+++ b/pkgs/tools/filesystems/kdiskmark/default.nix
@@ -5,19 +5,20 @@
 , qttools
 , fio
 , cmake
-, kauth
+, polkit-qt
 , extra-cmake-modules
 , fetchFromGitHub
 }:
 stdenv.mkDerivation rec {
   name = "kdiskmark";
-  version = "3.0.0";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "jonmagon";
     repo = "kdiskmark";
     rev = version;
-    sha256 = "sha256-fDimH0BX0zxGuOMNLhNbMGMr2pS+qbZhflSpoLFK+Ng=";
+    sha256 = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake wrapQtAppsHook ];
@@ -26,13 +27,12 @@ stdenv.mkDerivation rec {
     qtbase
     qttools
     extra-cmake-modules
-    kauth
+    polkit-qt
   ];
 
-  postInstall = ''
-    # so that kdiskmark can be used as unpriviledged user even on non-kde
-    # (where kauth is not in environment.systemPackages)
-    ln -s ${kauth}/share/dbus-1/system.d/org.kde.kf5auth.conf $out/share/dbus-1/system.d/00-kdiskmark-needs-org.kde.kf5auth.conf
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt \
+      --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions
   '';
 
   qtWrapperArgs =