Last active
October 29, 2020 13:52
-
-
Save peterhoeg/ce0a5dea5c1fe5918bbcbae9fbd3b779 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix | |
| index b1577a37844..aa8af832568 100644 | |
| --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix | |
| +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix | |
| @@ -1,17 +1,27 @@ | |
| -{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake | |
| -, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools | |
| -, libquotient, libsecret | |
| +{ mkDerivation | |
| +, stdenv | |
| +, lib | |
| +, fetchFromGitHub | |
| +, cmake | |
| +, qtbase | |
| +, qtquickcontrols | |
| +, qtquickcontrols2 | |
| +, qtkeychain | |
| +, qtmultimedia | |
| +, qttools | |
| +, libquotient | |
| +, libsecret | |
| }: | |
| mkDerivation rec { | |
| pname = "quaternion"; | |
| - version = "0.0.9.4e"; | |
| + version = "0.0.9.5-beta2"; | |
| src = fetchFromGitHub { | |
| - owner = "QMatrixClient"; | |
| + owner = "quotient-im"; | |
| repo = "Quaternion"; | |
| rev = "${version}"; | |
| - sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; | |
| + sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM="; | |
| }; | |
| buildInputs = [ | |
| @@ -26,14 +36,15 @@ mkDerivation rec { | |
| nativeBuildInputs = [ cmake qttools ]; | |
| - postInstall = if stdenv.isDarwin then '' | |
| - mkdir -p $out/Applications | |
| - mv $out/bin/quaternion.app $out/Applications | |
| - rmdir $out/bin || : | |
| - '' else '' | |
| - substituteInPlace $out/share/applications/com.github.quaternion.desktop \ | |
| - --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" | |
| - ''; | |
| + postInstall = | |
| + if stdenv.isDarwin then '' | |
| + mkdir -p $out/Applications | |
| + mv $out/bin/quaternion.app $out/Applications | |
| + rmdir $out/bin || : | |
| + '' else '' | |
| + substituteInPlace $out/share/applications/com.github.quaternion.desktop \ | |
| + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" | |
| + ''; | |
| meta = with lib; { | |
| description = | |
| diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix | |
| index c1cd3ca8d59..f776806e292 100644 | |
| --- a/pkgs/development/libraries/libquotient/default.nix | |
| +++ b/pkgs/development/libraries/libquotient/default.nix | |
| @@ -2,13 +2,13 @@ | |
| mkDerivation rec { | |
| pname = "libquotient"; | |
| - version = "0.6.0"; | |
| + version = "0.6.2"; | |
| src = fetchFromGitHub { | |
| owner = "quotient-im"; | |
| repo = "libQuotient"; | |
| rev = version; | |
| - sha256 = "1wpjrihi2gci3kwq9b3i3avd6bk3x7g22r0n6hvlphapkaf1ig6y"; | |
| + sha256 = "sha256-jQ9GR/lJrhQNIt3vycN7XkUZ5mmkJ8izNQhg9Y1nQZw="; | |
| }; | |
| buildInputs = [ qtbase qtmultimedia ]; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment