lol

Merge pull request #75405 from andersk/muse

muse: Use wrapQtAppsHook

authored by

worldofpeace and committed by
GitHub
9ef088c6 c693bd14

+8 -18
+7 -17
pkgs/applications/audio/muse/default.nix
··· 1 1 { stdenv 2 2 , fetchFromGitHub 3 3 , libjack2 4 - , qt5 4 + , wrapQtAppsHook 5 + , qtsvg 6 + , qttools 5 7 , cmake 6 8 , libsndfile 7 9 , libsamplerate ··· 13 15 , dssi 14 16 , liblo 15 17 , pkgconfig 16 - , gitAndTools 17 18 }: 18 19 19 20 stdenv.mkDerivation { ··· 45 46 46 47 nativeBuildInputs = [ 47 48 pkgconfig 48 - gitAndTools.gitFull 49 + wrapQtAppsHook 50 + qttools 51 + cmake 49 52 ]; 50 53 51 54 buildInputs = [ 52 55 libjack2 53 - qt5.qtsvg 54 - qt5.qttools 55 - cmake 56 + qtsvg 56 57 libsndfile 57 58 libsamplerate 58 59 ladspaH ··· 65 66 ]; 66 67 67 68 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 - ''; 79 69 }
+1 -1
pkgs/top-level/all-packages.nix
··· 24930 24930 24931 24931 mupen64plus = callPackage ../misc/emulators/mupen64plus { }; 24932 24932 24933 - muse = callPackage ../applications/audio/muse { }; 24933 + muse = libsForQt5.callPackage ../applications/audio/muse { }; 24934 24934 24935 24935 musly = callPackage ../applications/audio/musly { }; 24936 24936