Unverified Commit 010f412c authored by Aliaksandr's avatar Aliaksandr
Browse files

quaternion: 0.0.96.1 -> 0.0.97.1, move to by-name, fix build

parent 93cb49e2

pkgs/applications/networking/instant-messengers/quaternion/default.nix→pkgs/by-name/qu/quaternion/package.nix

+13 −30
Original line number Diff line number Diff line
@@ -3,56 +3,40 @@ 
  lib,

  fetchFromGitHub,

  cmake,

  wrapQtAppsHook,

  qtbase,

  qtquickcontrols2 ? null, # only a separate package on qt5

  qtkeychain,

  qtmultimedia,

  qttools,

  libquotient,

  qt6,

  libsecret,

  olm,

  kdePackages,

}:



let

  inherit (lib) cmakeBool;



in

stdenv.mkDerivation (finalAttrs: {

  pname = "quaternion";

  version = "0.0.96.1";

  version = "0.0.97.1";



  src = fetchFromGitHub {

    owner = "quotient-im";

    repo = "Quaternion";

    rev = finalAttrs.version;

    hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI=";

    tag = finalAttrs.version;

    hash = "sha256-Dn4E3mTqcNK88PNraL+qR1gREob5j7s3Qf8XAaTNSJg=";

  };



  buildInputs = [

    libquotient

    kdePackages.libquotient

    libsecret

    olm

    qtbase

    qtkeychain

    qtmultimedia

    qtquickcontrols2

    qt6.qtbase

    kdePackages.qtkeychain

    qt6.qtmultimedia

  ];



  nativeBuildInputs = [

    cmake

    qttools

    wrapQtAppsHook

    qt6.qttools

    qt6.wrapQtAppsHook

  ];



  # qt6 needs UTF

  env.LANG = "C.UTF-8";



  cmakeFlags = [

    # drop this from 0.0.97 onwards as it will be qt6 only

    (cmakeBool "BUILD_WITH_QT6" ((lib.versions.major qtbase.version) == "6"))

  ];



  postInstall =

    if stdenv.hostPlatform.isDarwin then

      ''
@@ -62,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { 
      ''

    else

      ''

        substituteInPlace $out/share/applications/com.github.quaternion.desktop \

          --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"

        substituteInPlace $out/share/applications/io.github.quotient_im.Quaternion.desktop \

          --replace-fail 'Exec=quaternion' "Exec=$out/bin/quaternion"

      '';



  meta = {
@@ -72,6 +56,5 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://matrix.org/ecosystem/clients/quaternion/";

    license = lib.licenses.gpl3;

    maintainers = with lib.maintainers; [ peterhoeg ];

    inherit (qtbase.meta) platforms;

  };

})

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -1670,9 +1670,6 @@ with pkgs; 
    charles5

    ;



  quaternion =  qt6Packages.callPackage ../applications/networking/instant-messengers/quaternion

      { };



  tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };



  libtensorflow = python3.pkgs.tensorflow-build.libtensorflow;