fix merge failure (2)
This commit is contained in:
@@ -935,10 +935,6 @@ in
|
|||||||
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
|
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
|
||||||
};
|
};
|
||||||
|
|
||||||
bibtextools = callPackage ../tools/typesetting/bibtex-tools {
|
|
||||||
inherit (strategoPackages016) strategoxt sdf;
|
|
||||||
};
|
|
||||||
|
|
||||||
blueman = callPackage ../tools/bluetooth/blueman {
|
blueman = callPackage ../tools/bluetooth/blueman {
|
||||||
inherit (gnome3) dconf gsettings_desktop_schemas;
|
inherit (gnome3) dconf gsettings_desktop_schemas;
|
||||||
withPulseAudio = config.pulseaudio or true;
|
withPulseAudio = config.pulseaudio or true;
|
||||||
|
|||||||
Reference in New Issue
Block a user