diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-15 14:26:52 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-15 14:26:52 +0000 |
commit | f68b2277b7d2f79adf6872a8461961b81f250af4 (patch) | |
tree | 713439d79ba588da5aa5537f01aa1a5d6b7ab5ca | |
parent | d44be49320fec5e19b4860333dec4f14a1c52a3f (diff) |
Adding qshowdiff.
svn path=/nixpkgs/trunk/; revision=20633
-rw-r--r-- | pkgs/tools/text/qshowdiff/default.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix new file mode 100644 index 000000000000..ee87bffc6729 --- /dev/null +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, qt, perl}: + +stdenv.mkDerivation rec { + name = "qshowdiff-1.2"; + + src = fetchurl { + url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz; + sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3"; + }; + + buildInputs = [ qt perl ]; + + configurePhase = '' + ensureDir $out/{bin,man/man1} + makeFlags="PREFIX=$out" + ''; + + meta = { + homepage = http://qshowdiff.danfis.cz/; + description = "Colourful diff viewer"; + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37c6e5238b1e..f245eb59dc4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1422,6 +1422,11 @@ let inherit stdenv fetchurl; }; + qshowdiff = import ../tools/text/qshowdiff { + inherit fetchurl stdenv perl; + qt = qt4; + }; + reiser4progs = import ../tools/filesystems/reiser4progs { inherit fetchurl stdenv libaal; }; |