Skip to content

Commit 2077519

Browse files
committed
vmpk: move to pkgs/by-name
1 parent 2bd0a0f commit 2077519

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
2-
mkDerivation,
2+
stdenv,
33
lib,
44
fetchurl,
55
cmake,
66
pkg-config,
7-
qttools,
8-
qtx11extras,
9-
drumstick,
7+
qt5,
8+
libsForQt5,
109
docbook-xsl-nons,
1110
}:
1211

13-
mkDerivation rec {
12+
stdenv.mkDerivation rec {
1413
pname = "vmpk";
1514
version = "0.8.8";
1615

@@ -22,18 +21,19 @@ mkDerivation rec {
2221
nativeBuildInputs = [
2322
cmake
2423
pkg-config
25-
qttools
24+
qt5.qttools
2625
docbook-xsl-nons
26+
qt5.wrapQtAppsHook
2727
];
2828

2929
buildInputs = [
30-
drumstick
31-
qtx11extras
30+
libsForQt5.drumstick
31+
qt5.qtx11extras
3232
];
3333

3434
postInstall = ''
3535
# vmpk drumstickLocales looks here:
36-
ln -s ${drumstick}/share/drumstick $out/share/
36+
ln -s ${libsForQt5.drumstick}/share/drumstick $out/share/
3737
'';
3838

3939
meta = with lib; {

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15617,8 +15617,6 @@ with pkgs;
1561715617
onlyLibVLC = true;
1561815618
};
1561915619

15620-
vmpk = libsForQt5.callPackage ../applications/audio/vmpk { };
15621-
1562215620
vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };
1562315621

1562415622
vorbis-tools = callPackage ../applications/audio/vorbis-tools {

0 commit comments

Comments
 (0)