git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75405 from andersk/muse

muse: Use wrapQtAppsHook

commit9ef088c6039ee947662f92be3f0907055dfac64a authorworldofpeace <worldofpeace@protonmail.ch> dateWed 29 Jan 2020, 18:45 (7 years ago) parentc693bd11bcb6fb
2 files changed+8−18
pkgs/applications/audio/muse/default.nix+7−17 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/audio/muse/default.nix+7−17
@@ -1,7 +1,9 @@
11{ stdenv
22, fetchFromGitHub
33, libjack2
4−, qt5
4+, wrapQtAppsHook
5+, qtsvg
6+, qttools
57, cmake
68, libsndfile
79, libsamplerate
@@ -13,7 +15,6 @@
1315, dssi
1416, liblo
1517, pkgconfig
16−, gitAndTools
1718}:
1819
1920stdenv.mkDerivation {
@@ -45,14 +46,14 @@ stdenv.mkDerivation {
4546
4647 nativeBuildInputs = [
4748 pkgconfig
48− gitAndTools.gitFull
49+ wrapQtAppsHook
50+ qttools
51+ cmake
4952 ];
5053
5154 buildInputs = [
5255 libjack2
53− qt5.qtsvg
54− qt5.qttools
55− cmake
56+ qtsvg
5657 libsndfile
5758 libsamplerate
5859 ladspaH
@@ -65,15 +66,4 @@ stdenv.mkDerivation {
6566 ];
6667
6768 sourceRoot = "source/muse3";
68−
69− buildPhase = ''
70− cd ..
71− bash compile_muse.sh
72− '';
73−
74− installPhase = ''
75− mkdir $out
76− cd build
77− make install
78− '';
7969}
pkgs/top-level/all-packages.nix+1−1
@@ -24930,7 +24930,7 @@ in
2493024930
2493124931 mupen64plus = callPackage ../misc/emulators/mupen64plus { };
2493224932
24933− muse = callPackage ../applications/audio/muse { };
24933+ muse = libsForQt5.callPackage ../applications/audio/muse { };
2493424934
2493524935 musly = callPackage ../applications/audio/musly { };
2493624936