mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-18 19:03:28 +00:00
qgit: 2.5 -> 2.6 (#22360)
Also: - build the qt5 version by default instead of qt4 - use cmake
This commit is contained in:
parent
47f392d3c7
commit
3d16d69b40
@ -80,7 +80,7 @@ rec {
|
||||
inherit (darwin) Security;
|
||||
};
|
||||
|
||||
qgit = callPackage ./qgit { };
|
||||
qgit = qt5.callPackage ./qgit { };
|
||||
|
||||
stgit = callPackage ./stgit {
|
||||
};
|
||||
|
@ -1,27 +1,22 @@
|
||||
{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }:
|
||||
{ stdenv, fetchurl, cmake, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qgit-2.5";
|
||||
name = "qgit-2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz";
|
||||
sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
|
||||
url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz";
|
||||
sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
buildInputs = [ qt4 libXext libX11 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
|
||||
installPhase = ''
|
||||
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";
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.gpl2;
|
||||
homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
|
||||
description = "Graphical front-end to Git";
|
||||
inherit (qt4.meta) platforms;
|
||||
maintainer = with maintainers; [ peterhoeg ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user