diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-01-16 11:35:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 11:35:27 -0500 |
| commit | fc4e67c811b7681e72a0324be0144d627005ab3d (patch) | |
| tree | 923b7527354066aab940f406aede9c0610f6359c | |
| parent | Merge pull request #281351 from NixOS/backport-281349-to-release-23.11 (diff) | |
| parent | open-watcom-v2-unwrapped: unstable-2023-05-17 -> unstable-2023-11-24, fix on ... (diff) | |
| download | nixpkgs-fc4e67c811b7681e72a0324be0144d627005ab3d.tar.gz | |
Merge pull request #281177 from NixOS/backport-244138-to-release-23.11
[Backport release-23.11] open-watcom-v2-unwrapped: unstable-2023-05-17 -> unstable-2023-11-24, fix on Darwin
| -rw-r--r-- | pkgs/development/compilers/open-watcom/v2.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index 481c8dabb2d3..80ee2ee5e45d 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "unstable-2023-05-17"; + version = "unstable-2023-11-24"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "4053c858ac1f83a186704434bd16b6a6b8f4cf88"; - sha256 = "sha256-o+cA5kqPow+ERCeWdA3UNKawF+EjuL87lPXUjFT/D1w="; + rev = "7976a5c7ca4e856907ccd378c17c71578ad51cb7"; + hash = "sha256-u9ljy4dZRoXKyUqdolxZijpc99TuhKPPlL6xlV3xJXA="; }; postPatch = '' @@ -47,6 +47,9 @@ stdenv.mkDerivation rec { ghostscript ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205 + env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) "-l${stdenv.cc.libcxx.cxxabi.libName}"; + configurePhase = '' runHook preConfigure |