| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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>
|