dwl: fix cross
I've moved the install flags into makeFlags because there's no need to have them only set at install time.
This commit is contained in:
parent
fc419f5af6
commit
cd8b2aa9b2
|
@ -9,6 +9,7 @@
|
||||||
, pixman
|
, pixman
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, substituteAll
|
, substituteAll
|
||||||
|
, wayland-scanner
|
||||||
, wayland
|
, wayland
|
||||||
, wayland-protocols
|
, wayland-protocols
|
||||||
, wlroots_0_16
|
, wlroots_0_16
|
||||||
|
@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
pkg-config
|
pkg-config
|
||||||
|
wayland-scanner
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -61,6 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
else writeText "config.def.h" conf;
|
else writeText "config.def.h" conf;
|
||||||
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
|
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
|
||||||
|
|
||||||
|
makeFlags = [
|
||||||
|
"PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
|
||||||
|
"WAYLAND_SCANNER=wayland-scanner"
|
||||||
|
"PREFIX=$(out)"
|
||||||
|
"MANDIR=$(man)/share/man/man1"
|
||||||
|
];
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
makeFlagsArray+=(
|
makeFlagsArray+=(
|
||||||
XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"}
|
XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"}
|
||||||
|
@ -68,11 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installFlags = [
|
|
||||||
"PREFIX=$(out)"
|
|
||||||
"MANDIR=$(man)/share/man/man1"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/djpohly/dwl/";
|
homepage = "https://github.com/djpohly/dwl/";
|
||||||
description = "Dynamic window manager for Wayland";
|
description = "Dynamic window manager for Wayland";
|
||||||
|
|
Loading…
Reference in a new issue