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

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

Browse source 
open-watcom-v2: unstable-2022-01-18 -> unstable-2022-02-22
This commit is contained in:
Artturi 2022-03-01 06:40:02 +02:00 committed by GitHub
commit 96dfcdeb91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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