wine: move gettext to nativeBuildInputs
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
bison,
|
||||
flex,
|
||||
fontforge,
|
||||
gettext,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
nixosTests,
|
||||
@@ -92,16 +93,19 @@ stdenv.mkDerivation (
|
||||
# Fixes "Compiler cannot create executables" building wineWow with mingwSupport
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
fontforge
|
||||
makeWrapper
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals supportFlags.mingwSupport (
|
||||
mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin
|
||||
);
|
||||
nativeBuildInputs =
|
||||
with supportFlags;
|
||||
[
|
||||
bison
|
||||
flex
|
||||
fontforge
|
||||
makeWrapper
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optional gettextSupport gettext
|
||||
++ lib.optionals mingwSupport (
|
||||
mingwGccs ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin
|
||||
);
|
||||
|
||||
buildInputs = toBuildInputs pkgArches (
|
||||
with supportFlags;
|
||||
@@ -115,7 +119,6 @@ stdenv.mkDerivation (
|
||||
++ lib.optional stdenv.hostPlatform.isLinux pkgs.libcap
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue
|
||||
++ lib.optional cupsSupport pkgs.cups
|
||||
++ lib.optional gettextSupport pkgs.gettext
|
||||
++ lib.optional dbusSupport pkgs.dbus
|
||||
++ lib.optional cairoSupport pkgs.cairo
|
||||
++ lib.optional odbcSupport pkgs.unixODBC
|
||||
|
||||
Reference in New Issue
Block a user