diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-15 05:45:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 05:45:09 +0000 |
| commit | 983df8cd7952495728db2c38fe33191bb99f1379 (patch) | |
| tree | 6c7f5f3d9bbec9d50d7baaf96114c446039b030b | |
| parent | 0feb4e8729e2117200ce30e63981e4de078a8e86 (diff) | |
| parent | b3f415d89898d450baf3fb27fdd891884adefb43 (diff) | |
| download | nixpkgs-983df8cd7952495728db2c38fe33191bb99f1379.tar nixpkgs-983df8cd7952495728db2c38fe33191bb99f1379.tar.gz nixpkgs-983df8cd7952495728db2c38fe33191bb99f1379.tar.bz2 nixpkgs-983df8cd7952495728db2c38fe33191bb99f1379.tar.lz nixpkgs-983df8cd7952495728db2c38fe33191bb99f1379.tar.xz nixpkgs-983df8cd7952495728db2c38fe33191bb99f1379.tar.zst nixpkgs-983df8cd7952495728db2c38fe33191bb99f1379.zip | |
Merge pull request #70953 from iAmMrinal0/fix/rescuetime
rescuetime: 2.14.3.1 -> 2.14.5.2
| -rw-r--r-- | pkgs/applications/misc/rescuetime/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index cd232088b5b..13ae1f1ba7d 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, makeWrapper, libXScrnSaver }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: let src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji"; + sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "03bky9vja7fijz45n44b6gawd6q8yd30nx6nya9lqdlxd1bkqmji"; + sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10"; }; -in stdenv.mkDerivation { +in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.14.3.1"; + name = "rescuetime-2.14.5.2"; inherit src; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 dontStrip = true; unpackPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bc9a8ad49d..e8b6c14f693 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5909,7 +5909,7 @@ in reptyr = callPackage ../os-specific/linux/reptyr {}; - rescuetime = callPackage ../applications/misc/rescuetime { }; + rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; reuse = callPackage ../tools/package-management/reuse { }; |