alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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
parent c693bd142c 1bcb6fb027
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
, fetchFromGitHub
, libjack2
, qt5
, wrapQtAppsHook
, qtsvg
, qttools
, cmake
, libsndfile
, libsamplerate
@ -13,7 +15,6 @@
, dssi
, liblo
, pkgconfig
, gitAndTools
}:
stdenv.mkDerivation {
@ -45,14 +46,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [
pkgconfig
gitAndTools.gitFull
wrapQtAppsHook
qttools
cmake
];
buildInputs = [
libjack2
qt5.qtsvg
qt5.qttools
cmake
qtsvg
libsndfile
libsamplerate
ladspaH
@ -65,15 +66,4 @@ stdenv.mkDerivation {
];
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 { };
muse = callPackage ../applications/audio/muse { };
muse = libsForQt5.callPackage ../applications/audio/muse { };
musly = callPackage ../applications/audio/musly { };