cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #185026 from OPNA2608/update/open-watcom-v2

Browse source
This commit is contained in:
Sandro 2022-08-14 00:48:51 +02:00 committed by GitHub
commit ec577833c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/compilers/open-watcom/bin.nix
View file

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

16
pkgs/development/compilers/open-watcom/v2.nix
View file

@ -11,15 +11,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "open-watcom-v2"; pname = "${passthru.prettyName}-unwrapped";
version = "unstable-2022-05-04"; version = "unstable-2022-08-02";
name = "${pname}-unwrapped-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-watcom"; owner = "open-watcom";
repo = "open-watcom-v2"; repo = "open-watcom-v2";
rev = "01662ab4eb50c0757969fa53bd4270dbbba45dc5"; rev = "4bdb73995b871982dd106838296903701ded29c2";
sha256 = "Nl5mcPDCr08XkVMWqkbbgTP/YjpfwMOo2GVu43FQQ3Y="; sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs=";
}; };
postPatch = '' postPatch = ''
@ -82,8 +81,11 @@ stdenv.mkDerivation rec {
# Stripping breaks many tools # Stripping breaks many tools
dontStrip = true; dontStrip = true;
passthru.updateScript = unstableGitUpdater { passthru = {
url = "https://github.com/open-watcom/open-watcom-v2.git"; prettyName = "open-watcom-v2";
updateScript = unstableGitUpdater {
url = "https://github.com/open-watcom/open-watcom-v2.git";
};
}; };
meta = with lib; { meta = with lib; {

2
pkgs/development/compilers/open-watcom/wrapper.nix
View file

@ -29,7 +29,7 @@ let
++ lib.optional isWindows "h/nt" ++ lib.optional isWindows "h/nt"
++ lib.optional isLinux "lh"; ++ lib.optional isLinux "lh";
listToDirs = list: lib.strings.concatMapStringsSep ":" (dir: "${placeholder "out"}/${dir}") list; 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 in
symlinkJoin { symlinkJoin {
inherit name; inherit name;