diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-01 06:08:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 06:08:33 +0000 |
| commit | 3135db28cb2d1136bde46aadb4adbbd8a7af0306 (patch) | |
| tree | 0869facf64d3a8aa4a0b01d95293272fd8050ed9 /pkgs/development/compilers | |
| parent | 9e44972094aa6b6aca6aa9e42264aa25da7f9b28 (diff) | |
| parent | 13e74fc7ff2f691da0791db67fe65930403b391d (diff) | |
| download | nixpkgs-3135db28cb2d1136bde46aadb4adbbd8a7af0306.tar nixpkgs-3135db28cb2d1136bde46aadb4adbbd8a7af0306.tar.gz nixpkgs-3135db28cb2d1136bde46aadb4adbbd8a7af0306.tar.bz2 nixpkgs-3135db28cb2d1136bde46aadb4adbbd8a7af0306.tar.lz nixpkgs-3135db28cb2d1136bde46aadb4adbbd8a7af0306.tar.xz nixpkgs-3135db28cb2d1136bde46aadb4adbbd8a7af0306.tar.zst nixpkgs-3135db28cb2d1136bde46aadb4adbbd8a7af0306.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/open-watcom/v2.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index de2dae156ee..b521aaef106 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -2,24 +2,24 @@ , lib , fetchFromGitHub , unstableGitUpdater +, dosbox # Docs cause an immense increase in build time, up to 2 additional hours , withDocs ? false -, dosbox , ghostscript , withGUI ? false }: stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-01-18"; + version = "unstable-2022-02-22"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0"; - sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA="; + rev = "9e25b3d6b8066f09b4f7131a31de1cf2af691e9a"; + sha256 = "1w336070kmhc6cmn2aqr8vm0fmw3yza2n0w4asvs2kqxjgmbn6i2"; }; postPatch = '' @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { --replace '-static' "" ''; - nativeBuildInputs = [ ] - ++ lib.optional (withDocs || withGUI) dosbox + nativeBuildInputs = [ dosbox ] ++ lib.optional withDocs ghostscript; configurePhase = '' @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { export OWGUINOBUILD=${if withGUI then "0" else "1"} export OWNOBUILD= export OWDISTRBUILD=0 - export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"} + export OWDOSBOX=${dosbox}/bin/dosbox export OWVERBOSE=0 export OWRELROOT=$out |