tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

toggldesktop: use mkDerivation from Qt (#81720)

(cherry picked from commit bfcb19197b117342da2676652fb5e30fe5323890)

authored by

Vladislav Zavialov and committed by
Dmitry Kalinkin af1b8e40 20fb1ce9

+8 -8
+8 -8
pkgs/applications/misc/toggldesktop/default.nix
··· 1 - { stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig 1 + { mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig 2 2 , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco 3 3 , qtbase, qtwebengine, qtx11extras, sqlite }: 4 4 ··· 11 11 sha256 = "01hqkx9dljnhwnyqi6mmzfp02hnbi2j50rsfiasniqrkbi99x9v1"; 12 12 }; 13 13 14 - bugsnag-qt = stdenv.mkDerivation rec { 14 + bugsnag-qt = mkDerivation rec { 15 15 pname = "bugsnag-qt"; 16 16 version = "20180522.005732"; 17 17 ··· 24 24 buildInputs = [ qtbase ]; 25 25 }; 26 26 27 - qxtglobalshortcut = stdenv.mkDerivation rec { 27 + qxtglobalshortcut = mkDerivation rec { 28 28 pname = "qxtglobalshortcut"; 29 29 version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; 30 30 ··· 37 37 buildInputs = [ qtbase qtx11extras ]; 38 38 }; 39 39 40 - qt-oauth-lib = stdenv.mkDerivation rec { 40 + qt-oauth-lib = mkDerivation rec { 41 41 pname = "qt-oauth-lib"; 42 42 version = "20190125.190943"; 43 43 ··· 62 62 mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc 63 63 ''; 64 64 65 - libtoggl = stdenv.mkDerivation { 65 + libtoggl = mkDerivation { 66 66 name = "libtoggl-${version}"; 67 67 inherit src version; 68 68 ··· 77 77 ''; 78 78 }; 79 79 80 - toggldesktop = stdenv.mkDerivation { 80 + toggldesktop = mkDerivation { 81 81 name = "${name}-unwrapped"; 82 82 inherit src version; 83 83 ··· 108 108 ]; 109 109 }; 110 110 111 - toggldesktop-icons = stdenv.mkDerivation { 111 + toggldesktop-icons = mkDerivation { 112 112 name = "${name}-icons"; 113 113 inherit (toggldesktop) src sourceRoot; 114 114 ··· 138 138 inherit name; 139 139 paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; 140 140 141 - meta = with stdenv.lib; { 141 + meta = with lib; { 142 142 description = "Client for Toggl time tracking service"; 143 143 homepage = https://github.com/toggl/toggldesktop; 144 144 license = licenses.bsd3;