mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
fix merge failure (2)
This commit is contained in:
parent
851446e26e
commit
56b56c2138
@ -935,10 +935,6 @@ in
|
||||
UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter;
|
||||
};
|
||||
|
||||
bibtextools = callPackage ../tools/typesetting/bibtex-tools {
|
||||
inherit (strategoPackages016) strategoxt sdf;
|
||||
};
|
||||
|
||||
blueman = callPackage ../tools/bluetooth/blueman {
|
||||
inherit (gnome3) dconf gsettings_desktop_schemas;
|
||||
withPulseAudio = config.pulseaudio or true;
|
||||
|
Loading…
Reference in New Issue
Block a user