diff options
author | Peter Hoeg <peter@speartail.com> | 2017-02-02 09:55:47 +0800 |
---|---|---|
committer | Joachim Schiele <js@lastlog.de> | 2017-02-02 02:55:47 +0100 |
commit | 3d16d69b4093b523e8d0583d44140d6ba77696e5 (patch) | |
tree | ab8ccb4127b2fc81fcf4eef84ad13f69020b54fe /pkgs | |
parent | 47f392d3c7a55e357f9da706211a0777ba53d2b5 (diff) | |
download | nixlib-3d16d69b4093b523e8d0583d44140d6ba77696e5.tar nixlib-3d16d69b4093b523e8d0583d44140d6ba77696e5.tar.gz nixlib-3d16d69b4093b523e8d0583d44140d6ba77696e5.tar.bz2 nixlib-3d16d69b4093b523e8d0583d44140d6ba77696e5.tar.lz nixlib-3d16d69b4093b523e8d0583d44140d6ba77696e5.tar.xz nixlib-3d16d69b4093b523e8d0583d44140d6ba77696e5.tar.zst nixlib-3d16d69b4093b523e8d0583d44140d6ba77696e5.zip |
qgit: 2.5 -> 2.6 (#22360)
Also: - build the qt5 version by default instead of qt4 - use cmake
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/qgit/default.nix | 27 |
2 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e8c7c3bfbfd7..975c83c6e979 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -80,7 +80,7 @@ rec { inherit (darwin) Security; }; - qgit = callPackage ./qgit { }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { }; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index b8d001ee97c8..5e3532b5643d 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -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; }; } |