mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 09:14:28 +00:00
erlang: wxmac -> wxGTK
This commit is contained in:
parent
2faf993fe8
commit
d72bcc2bc9
@ -17,7 +17,6 @@
|
|||||||
, libGL ? null
|
, libGL ? null
|
||||||
, libGLU ? null
|
, libGLU ? null
|
||||||
, wxGTK ? null
|
, wxGTK ? null
|
||||||
, wxmac ? null
|
|
||||||
, xorg ? null
|
, xorg ? null
|
||||||
, parallelBuild ? false
|
, parallelBuild ? false
|
||||||
, systemd
|
, systemd
|
||||||
@ -72,7 +71,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
assert wxSupport -> (if stdenv.isDarwin
|
assert wxSupport -> (if stdenv.isDarwin
|
||||||
then wxmac != null
|
then wxGTK != null
|
||||||
else libGL != null && libGLU != null && wxGTK != null && xorg != null);
|
else libGL != null && libGLU != null && wxGTK != null && xorg != null);
|
||||||
|
|
||||||
assert odbcSupport -> unixODBC != null;
|
assert odbcSupport -> unixODBC != null;
|
||||||
@ -80,7 +79,7 @@ assert javacSupport -> openjdk11 != null;
|
|||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib) optional optionals optionalAttrs optionalString;
|
inherit (lib) optional optionals optionalAttrs optionalString;
|
||||||
wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
|
wxPackages2 = if stdenv.isDarwin then [ wxGTK ] else wxPackages;
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
|
Loading…
Reference in New Issue
Block a user