Unverified Commit 6d367925 authored by linuxissuper's avatar linuxissuper Committed by GitHub
Browse files

sirikali: 1.5.1 -> 1.6.0 (#310323) 



move to by-name folder
build with qt6 instead of qt5

Co-authored-by: default avatarlinuxissuper <m+nix@linuxistcool.de>
parent e393de82

pkgs/tools/security/sirikali/default.nix→pkgs/by-name/si/sirikali/package.nix

+12 −21
Original line number Diff line number Diff line 
{ lib

, stdenv

, qtbase

, libpwquality

, hicolor-icon-theme

, fetchFromGitHub

, wrapQtAppsHook

, cmake

, pkg-config

, libgcrypt

, qt6

, kdePackages

, cryfs

, encfs

, fscrypt-experimental

, gocryptfs

, securefs

, sshfs

, libgcrypt

, libsecret

, kwallet

, withKWallet ? true

, withLibsecret ? true

}:



stdenv.mkDerivation rec {

  pname = "sirikali";

  version = "1.5.1";

  version = "1.6.0";



  src = fetchFromGitHub {

    owner = "mhogomchungu";

    repo = "sirikali";

    rev = version;

    hash = "sha256-1bY8cCMMK4Jie4+9c7eUEBrPEYDaOqFHZ5252TPSotA=";

    hash = "sha256-org8mYKwZDdOvkQyd3eD+GaI0aHshMbe2f9i1bM+lBk=";

  };



  buildInputs = [

    qtbase

    qt6.qtbase

    libpwquality

    hicolor-icon-theme

    libgcrypt

    cryfs

    encfs

    fscrypt-experimental

    gocryptfs

    securefs

    sshfs

  ]

  ++ lib.optionals withKWallet [ libsecret ]

  ++ lib.optionals withLibsecret [ kwallet ]

  ++ lib.optionals withKWallet [ kdePackages.kwallet ]

  ++ lib.optionals withLibsecret [ libsecret ]

  ;



  nativeBuildInputs = [

    wrapQtAppsHook

    qt6.wrapQtAppsHook

    cmake

    pkg-config

  ];
@@ -64,17 +57,13 @@ stdenv.mkDerivation rec { 
    ]}''

  ];



  postPatch = ''

    substituteInPlace "src/engines.cpp" --replace "/sbin/" "/run/wrappers/bin/"

  '';



  doCheck = true;



  cmakeFlags = [

    "-DINTERNAL_LXQT_WALLET=false"

    "-DNOKDESUPPORT=${if withKWallet then "false" else "true"}"

    "-DNOSECRETSUPPORT=${if withLibsecret then "false" else "true"}"

    "-DQT5=true"

    "-DBUILD_WITH_QT6=true"

  ];



  meta = with lib; {
@@ -83,5 +72,7 @@ stdenv.mkDerivation rec { 
    changelog = "https://github.com/mhogomchungu/sirikali/blob/${src.rev}/changelog";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ linuxissuper ];

    mainProgram = "sirikali";

    platforms = platforms.all;

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -41076,8 +41076,6 @@ with pkgs; 














  dict-cc-py = callPackage ../applications/misc/dict-cc-py { };



























  sirikali = libsForQt5.callPackage ../tools/security/sirikali { };



























  wpm = callPackage ../applications/misc/wpm { };





























  weggli = callPackage ../tools/security/weggli { };