diff options
Diffstat (limited to 'pkgs/applications/version-management')
-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 | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 562fd3a91f9f..9546c43454bd 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -32,7 +32,7 @@ rec { qgit = import ./qgit { inherit fetchurl stdenv; inherit (xlibs) libXext libX11; - qt = qt3; + qt = qt4; }; qgitGit = import ./qgit/qgit-git.nix { 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 e84f447f505f..8b53d2f5b779 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, qt, libXext, libX11}: stdenv.mkDerivation rec { - name = "qgit-1.5.8"; + name = "qgit-2.2"; meta = { license = "GPLv2"; @@ -11,8 +11,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/qgit/${name}.tar.bz2"; - sha256 = "0qmgd1cjny5aciljpvn2bczgdvlpgd2f7wzafda24zj4mzqnppsq"; + sha256 = "82adcc59b2a9d3a3e54eef9e6a76ac6583e459b6f5c97050d26b0593d11c3d32"; }; buildInputs = [qt libXext libX11]; - configureFlags = "CXXFLAGS=-O3"; + configurePhase = "qmake PREFIX=$out"; + installPhase = '' + install -s -D -m 755 bin/qgit "$out/bin/qgit" + ''; } |