public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge failure (2)

This commit is contained in:
Robin Gloster 2016-06-13 11:06:15 +00:00
parent 851446e26e
commit 56b56c2138
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -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;