Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c693bd142c1a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ef088c6039e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 7, 2020

  1. muse: Use wrapQtAppsHook. 

    Fixes this error:

qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
This application failed to start because no Qt platform plugin could
be initialized. Reinstalling the application may fix this problem.

Aborted (core dumped)

Also, remove the unnecessary build input `gitFull`, and enable
parallel building.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Jan 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dasJ Janne Heß
    GPG key ID: 69165158F05265DF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1bcb6fb View commit details

Commits on Jan 29, 2020

  1. Merge pull request #75405 from andersk/muse 

    muse: Use wrapQtAppsHook
    @worldofpeace
    worldofpeace authored Jan 29, 2020
    Copy the full SHA
    9ef088c View commit details
Showing with 8 additions and 18 deletions.
  1. +7 −17 pkgs/applications/audio/muse/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
24 changes: 7 additions & 17 deletions pkgs/applications/audio/muse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };