Merge pull request #71528 from davidak/xzoom

xzoom: fix version
NixOS · Oct 21, 2019 · a2f854b · a2f854b
2 parents 2695914 + 49945b9
commit a2f854b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git 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";
     })
   ];