From c01851e31c3f25a1debb130517b0a06c9bc8c772 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 20:13:24 +0100 Subject: [PATCH] ghostscriptX: remove appendToName to have a consistent package name for repology --- pkgs/misc/ghostscript/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index e80ad8a839fb4b2..327cf2862346c37 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { - pname = "ghostscript"; + pname = "ghostscript${lib.optionalString (x11Support) "-with-X"}"; version = "9.55.0"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/ghostscript-${version}.tar.xz"; sha512 = "27g72152mlwlalg232jxdhaf3ykgmqwi2pccbkwfygql1h9iz40plfbwbs1n0fkvm4zwzg5r9cr8g7w2dxih4jldiidv7rflxdy1is2"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69a11ddca15022d..bf46d9ab98e3f24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33070,10 +33070,10 @@ with pkgs; ghostscript = callPackage ../misc/ghostscript { }; - ghostscriptX = appendToName "with-X" (ghostscript.override { + ghostscriptX = ghostscript.override { cupsSupport = true; x11Support = true; - }); + }; glava = callPackage ../applications/misc/glava {};