From 282cdca784edfde2c14c990bd0107ab7c0d2a5e8 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 3 Dec 2018 01:31:29 +0100 Subject: [PATCH] add local overlay --- create_symlinks.sh | 4 +-- home/ov/amarok.nix | 42 +++++++++++++++++++++++++++++ home/ov/dino.nix | 67 ++++++++++++++++++++++++++++++++++++++++++++++ home/overlays.nix | 6 +++++ 4 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 home/ov/amarok.nix create mode 100644 home/ov/dino.nix create mode 100644 home/overlays.nix diff --git a/create_symlinks.sh b/create_symlinks.sh index 476c64e..e19c51b 100755 --- a/create_symlinks.sh +++ b/create_symlinks.sh @@ -8,12 +8,12 @@ HOMECONFIGPATH="${HOME}/.config/nixpkgs" NIXOSCONFIGPATH="/etc/nixos" mkdir -p "${HOMECONFIGPATH}" -for F in `find ./home -mindepth 1`; do +for F in `find ./home -mindepth 1 -maxdepth 1`; do ABS_F=`readlink -f "${F}"` ln -s "$ABS_F" "${HOMECONFIGPATH}/`basename ${F}`" done -for F in `find ./nixos -mindepth 1`; do +for F in `find ./nixos -mindepth 1 -maxdepth 1`; do ABS_F=`readlink -f "${F}"` sudo ln -s "$ABS_F" "${NIXOSCONFIGPATH}/`basename ${F}`" done diff --git a/home/ov/amarok.nix b/home/ov/amarok.nix new file mode 100644 index 0000000..ace2b51 --- /dev/null +++ b/home/ov/amarok.nix @@ -0,0 +1,42 @@ +{ 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 ]; + }; +} diff --git a/home/ov/dino.nix b/home/ov/dino.nix new file mode 100644 index 0000000..25714c7 --- /dev/null +++ b/home/ov/dino.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub +, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext +, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking +, xorg, libXdmcp, libxkbcommon +, libnotify, libsoup +, libgcrypt +, epoxy +, at-spi2-core +, sqlite +, dbus +, gpgme +, pcre +, qrencode + }: + +stdenv.mkDerivation rec { + name = "dino-unstable-2018-11-29"; + + src = fetchFromGitHub { + owner = "dino"; + repo = "dino"; + rev = "680d28360c781ff29e810821801cfaba0493c526"; + sha256 = "1w08xc842p2nggdxf0dwqw8izhwsrqah10w3s0v1i7dp33yhycln"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + vala + cmake + ninja + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + qrencode + gobjectIntrospection + glib-networking + glib + gnome3.libgee + gnome3.defaultIconTheme + sqlite + gdk_pixbuf + gtk3 + libnotify + gpgme + libgcrypt + libsoup + pcre + xorg.libxcb + xorg.libpthreadstubs + libXdmcp + libxkbcommon + epoxy + at-spi2-core + dbus + gettext + ]; + + meta = with stdenv.lib; { + description = "Modern Jabber/XMPP Client using GTK+/Vala"; + homepage = https://github.com/dino/dino; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/home/overlays.nix b/home/overlays.nix new file mode 100644 index 0000000..e36d6af --- /dev/null +++ b/home/overlays.nix @@ -0,0 +1,6 @@ +[(self: super: +{ + dino = super.callPackage ./ov/dino.nix {}; + amarok = super.libsForQt5.callPackage ./ov/amarok.nix {}; +} +)]