public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75405 from andersk/muse

Browse Source 
muse: Use wrapQtAppsHook
This commit is contained in:
worldofpeace 2020-01-29 18:45:49 -05:00 committed by GitHub
commit 9ef088c603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/audio/muse/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, libjack2 , libjack2
, qt5 , wrapQtAppsHook
, qtsvg
, qttools
, cmake , cmake
, libsndfile , libsndfile
, libsamplerate , libsamplerate
@ -13,7 +15,6 @@
, dssi , dssi
, liblo , liblo
, pkgconfig , pkgconfig
, gitAndTools
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -45,14 +46,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
gitAndTools.gitFull wrapQtAppsHook
qttools
cmake
]; ];
buildInputs = [ buildInputs = [
libjack2 libjack2
qt5.qtsvg qtsvg
qt5.qttools
cmake
libsndfile libsndfile
libsamplerate libsamplerate
ladspaH ladspaH
@ -65,15 +66,4 @@ stdenv.mkDerivation {
]; ];
sourceRoot = "source/muse3"; sourceRoot = "source/muse3";
buildPhase = ''
cd ..
bash compile_muse.sh
'';
installPhase = ''
mkdir $out
cd build
make install
'';
} }

2
pkgs/top-level/all-packages.nix
View File

@ -24930,7 +24930,7 @@ in
mupen64plus = callPackage ../misc/emulators/mupen64plus { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { };
muse = callPackage ../applications/audio/muse { }; muse = libsForQt5.callPackage ../applications/audio/muse { };
musly = callPackage ../applications/audio/musly { }; musly = callPackage ../applications/audio/musly { };