cross compilation: emulate less in dconf
This commit is contained in:
parent
fd080393f8
commit
f96f2ec960
|
@ -391,12 +391,19 @@ in
|
||||||
inherit (emulated) stdenv;
|
inherit (emulated) stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
dconf = (prev.dconf.override {
|
# dconf = (prev.dconf.override {
|
||||||
|
# # we need dconf to build with vala, because dconf-editor requires that.
|
||||||
|
# # this only happens if dconf *isn't* cross-compiled
|
||||||
|
# inherit (emulated) stdenv;
|
||||||
|
# }).overrideAttrs (upstream: {
|
||||||
|
# nativeBuildInputs = lib.remove next.glib upstream.nativeBuildInputs;
|
||||||
|
# });
|
||||||
|
dconf = prev.dconf.overrideAttrs (upstream: {
|
||||||
# we need dconf to build with vala, because dconf-editor requires that.
|
# we need dconf to build with vala, because dconf-editor requires that.
|
||||||
# this only happens if dconf *isn't* cross-compiled
|
# upstream nixpkgs explicitly disables that on cross compilation, but in fact, it works.
|
||||||
inherit (emulated) stdenv;
|
# so just undo upstream's mods.
|
||||||
}).overrideAttrs (upstream: {
|
buildInputs = upstream.buildInputs ++ [ next.vala ];
|
||||||
nativeBuildInputs = lib.remove next.glib upstream.nativeBuildInputs;
|
mesonFlags = lib.remove "-Dvapi=false" upstream.mesonFlags;
|
||||||
});
|
});
|
||||||
|
|
||||||
emacs = prev.emacs.override {
|
emacs = prev.emacs.override {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user