Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c42b570101ce
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f835c663932e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 28, 2019

  1. clipgrab: 3.7.2 -> 3.8.2, qt4 -> qt5

    @dtzWill
    dtzWill committed Feb 28, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    82e7322 View commit details

Commits on Mar 7, 2019

  1. Merge pull request #56548 from dtzWill/update/clipgrab-3.8.2-qt5 

    clipgrab: 3.7.2 -> 3.8.2, qt4 -> qt5
    @dtzWill
    dtzWill authored Mar 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f835c66 View commit details
Showing with 9 additions and 6 deletions.
  1. +8 −5 pkgs/applications/video/clipgrab/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
13 changes: 8 additions & 5 deletions pkgs/applications/video/clipgrab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4, qmake4Hook }:
{ stdenv, fetchurl, makeDesktopItem, ffmpeg
, qmake, qttools
, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
}:

stdenv.mkDerivation rec {
name = "clipgrab-${version}";
version = "3.7.2";
version = "3.8.2";

src = fetchurl {
sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc";
sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${name}.tar.gz";
};

buildInputs = [ ffmpeg qt4 ];
nativeBuildInputs = [ qmake4Hook ];
buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
nativeBuildInputs = [ qmake qttools ];

postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
substituteInPlace converter_ffmpeg.cpp \
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16476,7 +16476,7 @@ in

cligh = python3Packages.callPackage ../development/tools/github/cligh {};

clipgrab = callPackage ../applications/video/clipgrab { };
clipgrab = qt5.callPackage ../applications/video/clipgrab { };

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