about summary refs log tree commit diff
path: root/pkgs/tools/misc/rockbox-utility
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-05-02 22:58:02 +0000
committerRobin Gloster <mail@glob.in>2016-05-02 22:58:02 +0000
commitc92bca56f8ea5623cf01952621455db308d0f330 (patch)
treef940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/tools/misc/rockbox-utility
parent0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff)
parent94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff)
downloadnixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst
nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/misc/rockbox-utility')
-rw-r--r--pkgs/tools/misc/rockbox-utility/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index c9c0cf6949f8..54a6b0309b00 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb1, qt4 }:
+{ stdenv, fetchurl, libusb1, qt4, qmake4Hook }:
 
 stdenv.mkDerivation  rec {
   name = "rockbox-utility-${version}";
@@ -10,10 +10,10 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [ libusb1 qt4 ];
+  nativeBuildInputs = [ qmake4Hook ];
 
-  preBuild = ''
+  preConfigure = ''
     cd rbutil/rbutilqt
-    qmake
   '';
 
   installPhase = ''