| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
This actually fixes the build of libjreen against Qt 5.6, the rest of
the dependencies work fine with Qt 5.6.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
Let's use the new upstream qt5.qtkeychain attribute instead of
overriding it on our own, introduced in:
NixOS/nixpkgs@1187b00e5872c8b65919158f2f908efb29117649
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes the build for Tomahawk because some of these dependencies
were already refactored in upstream <nixpkgs> and hence we can simply
specify the dependencies directly.
Alongside of this, I've broken out some of the buildInputs into
nativeBuildInputs, so this will stay safe for cross compilation.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
This reverts commit 267b8363695190f2d0834892b4b1159d7918d447.
Issue NixOS/nixpkgs#15498 is already fixed upstream, so this ugly
workaround isn't needed anymore.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Just a small workaround for NixOS/nixpkgs#15498, because putting the
Vuizvui version of Tomahawk into systemPackages will propagate Qt 5.5
into the system path, which in turn causes KDE initalization to
dlopen() Qt 5.5 libraries while being linked against Qt 5.6 libraries.
We currently can't link Tomahawk against Qt 5.6, because it depends on
QtWebKit, so moving Tomahawk to Qt 5.6 is not an option yet until
QtWebEngine is packaged.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
It's been a while since the last update, so let's change that.
I haven't tested whether the current version works, only tested building
against it and it built fine.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Right now we haven't packaged QtWebEngine for Qt 5.6, so we can't easily
switch towards using the qt5 attribute, which is Qt 5.6 already.
So we need to make sure that attica, extra-cmake-modules and qca are
using qt55 explicitly as well so we don't have any reference to Qt 5.6
anymore left (checked using nix-store -qR on the .drv).
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
This attribute has been renamed in NixOS/nixpkgs@a2e40003a19de448.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
In NixOS/nixpkgs@1d33148, quazip moved from a top-level attribute down
to a sub-attribute of qt5LibsFun, which in turn gets exposed via the
"qt5" top-level attribute.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
Since NixOS/nixpkgs@0a81a0d, kf5_latest expects an attribute set as an
argument (in this case the attribute set/scope for qt55libs).
This however is passed by kde5_latest, so let's switch to use that
attribute set instead.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes the following build error:
https://headcounter.org/hydra/build/764598
Of course, we could have fixed this by overriding Lucene++, but we want
to stay on the latest Qt version for Tomahawk anyway.
We no longer need qcaQT5, because that has been packaged upstream.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
Yes, I know that it's only two more commits we don't really care about,
but I needed my Hydra to evaluatio the jobset again in order to test
channels.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The generalization is done by symlinking include dirs and libraries to
the corresponding suffixed versions *only* if there isn't a ...5 suffix
already.
We now no longer need to pass QUAZIP_INCLUDE_DIR and QUAZIP_LIBRARIES as
cmakeFlags, because the Tomahawk cmake build is able to find it by
itself.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Same as with 9ea16e0 and d3bfedd.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's not a big issue, because due to Nix's stdenv it's going to be able
to link anyway, but there still is a nasty warning, we're getting rid by
this:
WARNING: Target "tomahawklib" requests linking to directory
"/nix/store/ybw942c8jw0dyjah0r0pcsgn8q0sv02h-quazip-0.7.1/lib". Targets
may link only to libraries. CMake is dropping the item.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Just as with echonest vs. echonest5 we now have lastfm vs. lastfm5.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Tomahawk expects the echonest library to have a "5" suffix in its
include dir, so let's simply symlink it to the unsuffixed version.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
Thanks to @muesli for mentioning this, so we no longer need to patch
Tomahawk's CMakeList.txt.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
| |
The libraries are searched in $KDE4_INCLUDE_DIR or in some other paths
but with a prefix. On Nix however we don't need a prefix and our
dependencies are strictly separate so searching in KDE4_INCLUDE_DIR
won't work either.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
The upstream cmake script wasn't able to find it by itself, but haven't
looked into it whether this is only a Nix specific problem or whether it
applies generally.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
|
|
| |
The upstream Tomahawk CMakeLists.txt contains a distro-specific name,
which doesn't work well when using the name from upstream Qca. So let's
rename it accordingly.
Cc: @muesli
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
| |
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Building qtkeychain with Qt5 requires Qt5LinguistTools.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
|
| |
It is included in Qt5 already and the separate one also won't build with
newer Qt, so let's null it out for echonest and remove it from
Tomahawk's buildInputs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
Using the attica version from the KDE frameworks attribute set.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
This was changed in tomahawk-player/tomahawk@873c35a, so let's adapt
accordingly and jump straight to Qt 5.4 instead of plain old 5.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
| |
We're feeling to old, don't we? ;-)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
|
|
|
|
|
| |
As of NixOS/nixpkgs@ee7c9bd this is no longer needed, as the new
upstream version of QCA2 includes the plugin already.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
|
I'm including the whole file here, because it's easier to move it to
<nixpkgs> once version 0.9.0 is finally released.
This finally gets rid of the damn phonon dependency which cased most of
my playback issues so far.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|