conky: build without emulation
This commit is contained in:
parent
2773cd8406
commit
44ee7cd3db
|
@ -292,11 +292,22 @@ in {
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
conky = ((useEmulatedStdenv prev.conky).override {
|
# conky = ((useEmulatedStdenv prev.conky).override {
|
||||||
|
# # docbook2x dependency doesn't cross compile
|
||||||
|
# docsSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
|
||||||
|
# }).overrideAttrs (upstream: {
|
||||||
|
# nativeBuildInputs = upstream.nativeBuildInputs ++ [ final.git ];
|
||||||
|
# });
|
||||||
|
conky = (prev.conky.override {
|
||||||
# docbook2x dependency doesn't cross compile
|
# docbook2x dependency doesn't cross compile
|
||||||
docsSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
|
docsSupport = prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform;
|
||||||
}).overrideAttrs (upstream: {
|
}).overrideAttrs (upstream: {
|
||||||
nativeBuildInputs = upstream.nativeBuildInputs ++ [ final.git ];
|
nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||||
|
# "Unable to find program 'git'"
|
||||||
|
final.git
|
||||||
|
# "bash: line 1: toluapp: command not found"
|
||||||
|
final.toluapp
|
||||||
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
# cozy = prev.cozy.override {
|
# cozy = prev.cozy.override {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user