public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qgit: 2.5 -> 2.6 (#22360)

Browse Source 
Also:

 - build the qt5 version by default instead of qt4
 - use cmake
This commit is contained in:
Peter Hoeg 2017-02-02 09:55:47 +08:00 committed by Joachim Schiele
parent 47f392d3c7
commit 3d16d69b40
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -80,7 +80,7 @@ rec {
inherit (darwin) Security; inherit (darwin) Security;
}; };
qgit = callPackage ./qgit { }; qgit = qt5.callPackage ./qgit { };
stgit = callPackage ./stgit { stgit = callPackage ./stgit {
}; };

27
pkgs/applications/version-management/git-and-tools/qgit/default.nix
View File

@ -1,27 +1,22 @@
{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }: { stdenv, fetchurl, cmake, qtbase }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qgit-2.5"; name = "qgit-2.6";
src = fetchurl { src = fetchurl {
url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz"; url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz";
sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499"; sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl";
}; };
hardeningDisable = [ "format" ]; buildInputs = [ qtbase ];
buildInputs = [ qt4 libXext libX11 ]; nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ qmake4Hook ]; meta = with stdenv.lib; {
license = licenses.gpl2;
installPhase = '' homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
install -s -D -m 755 bin/qgit "$out/bin/qgit"
'';
meta = {
license = stdenv.lib.licenses.gpl2;
homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
description = "Graphical front-end to Git"; description = "Graphical front-end to Git";
inherit (qt4.meta) platforms; maintainer = with maintainers; [ peterhoeg ];
inherit (qtbase.meta) platforms;
}; };
} }