diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-10-21 19:41:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 19:41:37 +0000 |
| commit | a2f854b6eeba64b8c0a4d3f14286778a83a3ac3c (patch) | |
| tree | 42ba4798e27c77726fa516968c4b02c23a81498e /pkgs/tools | |
| parent | 2695914175575e9ad8ae9a602a9c9668ff6e24d5 (diff) | |
| parent | 49945b95d02a6a3bc692a486d3701055657e3e68 (diff) | |
Merge pull request #71528 from davidak/xzoom
xzoom: fix version
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/xzoom/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index d1867e3b077b9..e414576b5230d 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}: stdenv.mkDerivation rec { - name = "${pname}-${version}.${patchlevel}"; + name = "${pname}-${version}"; pname = "xzoom"; - version = "0.3"; - patchlevel = "24"; + major = "0"; + minor = "3"; + patch = "24"; + version = "${major}.${minor}.${patch}"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${version}.tgz"; + url = "http://www.ibiblio.org/pub/linux/libs/X/${pname}-${major}.${minor}.tgz"; sha256 = "0jzl5py4ny4n4i58lxx2hdwq9zphqf7h3m14spl3079y5mlzssxj"; }; patches = [ (fetchurl { - url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${version}-${patchlevel}.diff.gz"; + url = "http://http.debian.net/debian/pool/main/x/xzoom/xzoom_${major}.${minor}-${patch}.diff.gz"; sha256 = "0zhc06whbvaz987bzzzi2bz6h9jp6rv812qs7b71drivvd820qbh"; }) ]; |