From 87f08e8899becad629369a43a4b216fb6e1df69f Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 8 May 2021 17:44:30 +0200 Subject: [PATCH] hylafaxplus: switch to pname+version To support efforts like https://github.com/NixOS/nixpkgs/issues/103997 this splits `name` into `pname` and `version`. --- pkgs/servers/hylafaxplus/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index bb56e63c40e4..4ce0d63f6bed 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -30,12 +30,12 @@ let - name = "hylafaxplus-${version}"; + pname = "hylafaxplus"; version = "7.0.3"; sha256 = "139iwcwrn9i5lragxi33ilzah72w59wg4midfjjgx5cly3ah0iy4"; configSite = substituteAll { - name = "hylafaxplus-config.site"; + name = "${pname}-config.site"; src = ./config.site; config_maxgid = lib.optionalString (maxgid!=null) ''CONFIG_MAXGID=${builtins.toString maxgid}''; ghostscript_version = ghostscript.version; @@ -44,7 +44,7 @@ let }; postPatch = substituteAll { - name = "hylafaxplus-post-patch.sh"; + name = "${pname}-post-patch.sh"; src = ./post-patch.sh; inherit configSite; maxuid = lib.optionalString (maxuid!=null) (builtins.toString maxuid); @@ -55,7 +55,7 @@ let }; postInstall = substituteAll { - name = "hylafaxplus-post-install.sh"; + name = "${pname}-post-install.sh"; src = ./post-install.sh; inherit fakeroot libfaketime; }; @@ -63,7 +63,7 @@ let in stdenv.mkDerivation { - inherit name version; + inherit pname version; src = fetchurl { url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz"; inherit sha256;