enable adb support
This commit is contained in:
parent
1001ea611e
commit
137fa8fa6a
|
@ -1,42 +0,0 @@
|
|||
{ mkDerivation, fetchgit, lib
|
||||
, extra-cmake-modules, kdoctools
|
||||
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
|
||||
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem, kcrash
|
||||
, fftw, phonon, plasma-framework, threadweaver
|
||||
, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "amarok";
|
||||
version = "2.9.70-20181130";
|
||||
|
||||
in mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
# master has the Qt5 version as of April 2018 but a formal release has not
|
||||
# yet been made so change this back to the proper upstream when such a
|
||||
# release is out
|
||||
url = git://anongit.kde.org/amarok.git;
|
||||
# url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
rev = "87a6d7a37356108ae17cc42033e5f2cdde5f70c4";
|
||||
sha256 = "1b8jc4k490dhqf1hzksxyyvkjmv6n2bnpm1vbp1lpplr1qhi6zfn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
|
||||
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem kcrash
|
||||
phonon plasma-framework threadweaver
|
||||
curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
|
||||
pcre snappy taglib taglib_extras
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
|
@ -8,8 +8,8 @@ in
|
|||
(
|
||||
self: super:
|
||||
rec {
|
||||
#jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {};
|
||||
seafile-server = unstable.seafile-server;
|
||||
amarok = super.libsForQt5.callPackage ./ov/amarok.nix {};
|
||||
#stapler = super.python2.callPackage ./ov/stapler.nix {};
|
||||
myVim = with super; (vim_configurable.override { python = python3; }).customize {
|
||||
# executable/ package name
|
||||
|
|
|
@ -79,6 +79,9 @@ in
|
|||
enable = true;
|
||||
package = pkgs.wireshark-qt;
|
||||
};
|
||||
|
||||
programs.adb.enable = true;
|
||||
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
|
||||
|
||||
|
@ -149,7 +152,7 @@ in
|
|||
users.users.spiollinux = {
|
||||
isNormalUser = true;
|
||||
uid = 1000;
|
||||
extraGroups = [ "vboxusers" "wheel" "networkmanager" "scanner" "lp" "wireshark" "dialout" "cdrom" "input" ];
|
||||
extraGroups = [ "vboxusers" "wheel" "networkmanager" "scanner" "lp" "wireshark" "dialout" "cdrom" "input" "adbusers" ];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
#home-manager.users.spiollinux = import "${users.users.spiollinux.home}/nixconfigs/home/home.nix" { pkgs, ...};
|
||||
|
|
Loading…
Reference in a new issue