wrapWatcom: use passthru.prettyName

This commit is contained in:
OPNA2608 2022-08-03 16:35:12 +02:00
parent cf6b5e1624
commit 16395a9797
3 changed files with 10 additions and 7 deletions

View file

@ -85,9 +85,8 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "open-watcom-bin";
pname = "${passthru.prettyName}-unwrapped";
version = "1.9";
name = "${pname}-unwrapped-${version}";
src = fetchurl {
url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}";
@ -113,6 +112,8 @@ stdenvNoCC.mkDerivation rec {
done
'';
passthru.prettyName = "open-watcom-bin";
meta = with lib; {
description = "A project to maintain and enhance the Watcom C, C++, and Fortran cross compilers and tools";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];

View file

@ -11,9 +11,8 @@
}:
stdenv.mkDerivation rec {
pname = "open-watcom-v2";
pname = "${passthru.prettyName}-unwrapped";
version = "unstable-2022-08-02";
name = "${pname}-unwrapped-${version}";
src = fetchFromGitHub {
owner = "open-watcom";
@ -82,8 +81,11 @@ stdenv.mkDerivation rec {
# Stripping breaks many tools
dontStrip = true;
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/open-watcom/open-watcom-v2.git";
passthru = {
prettyName = "open-watcom-v2";
updateScript = unstableGitUpdater {
url = "https://github.com/open-watcom/open-watcom-v2.git";
};
};
meta = with lib; {

View file

@ -29,7 +29,7 @@ let
++ lib.optional isWindows "h/nt"
++ lib.optional isLinux "lh";
listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list;
name = "${open-watcom.pname}-${open-watcom.version}";
name = "${open-watcom.passthru.prettyName}-${open-watcom.version}";
in
symlinkJoin {
inherit name;