From 57e596a8651417107220c320bf39fec37d4066f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Sep 2022 14:49:28 +0200 Subject: [PATCH] webkitgtk: Display ABI version in name To make it easier to distinguish which versions are in the closure. --- pkgs/development/libraries/webkitgtk/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 0f2898a11a5d..24132fb44d5e 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -66,16 +66,17 @@ , systemdSupport ? stdenv.isLinux }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; version = "2.37.90"; + name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; separateDebugInfo = stdenv.isLinux; src = fetchurl { - url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; + url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; sha256 = "sha256-5VRyTvUnhJ02+3VNQrDNs5/0pscRhhtU25h0DV3mD5E="; }; @@ -163,7 +164,7 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommand "${pname}_headers" { } '' + runCommand "webkitgtk_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ @@ -242,4 +243,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; broken = stdenv.isDarwin; }; -} +})