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: ad3220f9ff3f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5af0a6c7f4d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 6, 2020

  1. rockbox-utility: add wrapQtAppsHook 

    It seems like all QT apps which use dynamic plugins should be wrapped
with `wrapQtAppsHook`. However, rockbox-utility is still not wrapped,
therefore fails to launch.

This change adds `qt5.wrapQtAppsHook` to nativeBuildInputs of
rockbox-utility.
    @akhramov
    akhramov committed Apr 6, 2020
    Copy the full SHA
    861df8a View commit details

  2. Merge pull request #84450 from akhramov/master 

    rockbox-utility: add wrapQtAppsHook
    @Mic92
    Mic92 authored Apr 6, 2020
    Copy the full SHA
    5af0a6c View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/misc/rockbox-utility/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/misc/rockbox-utility/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libusb1
, qtbase, qttools, makeWrapper, qmake
, withEspeak ? false, espeak ? null }:
, withEspeak ? false, espeak ? null, qt5 }:

let inherit (stdenv.lib) getDev; in

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

buildInputs = [ libusb1 qtbase qttools ]
++ stdenv.lib.optional withEspeak espeak;
nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ];

postPatch = ''
sed -i rbutil/rbutilqt/rbutilqt.pro \