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

qt5: rename qmakeHook to qmake

Browse Source
This commit is contained in:
Thomas Tuegel
2017-06-18 08:41:57 -05:00
parent 3f3d33a078
commit 210f688802
65 changed files with 165 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/dfasma/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmakeHook, makeQtWrapper }:
{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake, makeQtWrapper }:
let
@@ -37,9 +37,9 @@ in stdenv.mkDerivation rec {
owner = "gillesdegottex";
};
buildInputs = [ fftw libsndfile qtbase qtmultimedia qmakeHook ];
buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
nativeBuildInputs = [ makeQtWrapper ];
nativeBuildInputs = [ makeQtWrapper qmake ];
postPatch = ''
substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
pkgs/applications/audio/fmit/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmakeHook
{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake
, alsaSupport ? true, alsaLib ? null
, jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "gillesdegottex";
};
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
buildInputs = [ fftw qtbase qtmultimedia ]
++ optionals alsaSupport [ alsaLib ]
++ optionals jackSupport [ libjack2 ]
pkgs/applications/audio/iannix/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmakeHook
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
}:
stdenv.mkDerivation rec {
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
};
buildInputs = [ alsaLib pkgconfig qtbase qtscript qmakeHook ];
nativeBuildInputs = [ qmake ];
buildInputs = [ alsaLib pkgconfig qtbase qtscript ];
qmakeFlags = [ "PREFIX=/" ];
pkgs/applications/audio/keyfinder/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmakeHook, taglib }:
{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }:
stdenv.mkDerivation rec {
name = "keyfinder-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
owner = "ibsh";
};
buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns qmakeHook taglib ];
nativeBuildInputs = [ qmake ];
buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
postPatch = ''
substituteInPlace is_KeyFinder.pro \
pkgs/applications/audio/sonic-visualiser/default.nix
+3 -4
View File
@@ -3,7 +3,7 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
, qmakeHook, rubberband, serd, sord, vampSDK, fftwFloat
, qmake, rubberband, serd, sord, vampSDK, fftwFloat
}:
stdenv.mkDerivation rec {
@@ -16,11 +16,10 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ libsndfile qtbase qmakeHook fftw fftwFloat bzip2 librdf rubberband
[ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband
libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
serd
sord
pkgconfig
# optional
libjack2
# portaudio
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
libX11
];
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
configurePhase = ''
for i in sonic-visualiser svapp svcore svgui;
pkgs/applications/editors/rstudio/default.nix
+3 -2
View File
@@ -10,7 +10,8 @@ in
stdenv.mkDerivation rec {
name = "RStudio-${version}";
buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qmakeHook libuuid unzip ant jdk makeWrapper pandoc ];
buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ];
nativeBuildInputs = [ qt5.qmake ];
src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
@@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
'';
cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmakeHook}/bin/qmake" ];
cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ];
desktopItem = makeDesktopItem {
name = name;
pkgs/applications/editors/tiled/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmakeHook
{ stdenv, fetchFromGitHub, pkgconfig, qmake
, python, qtbase, qttools, zlib }:
let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2";
};
nativeBuildInputs = [ pkgconfig qmakeHook ];
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ python qtbase qttools ];
enableParallelBuilding = true;
pkgs/applications/graphics/awesomebump/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, qtbase, qmakeHook, makeWrapper }:
{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
stdenv.mkDerivation {
name = "awesomebump-4.0";
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
setSourceRoot = "sourceRoot=$(echo */Sources)";
buildInputs = [ qtbase qmakeHook makeWrapper ];
nativeBuildInputs = [ makeWrapper qmake ];
buildInputs = [ qtbase ];
enableParallelBuilding = true;
pkgs/applications/graphics/phototonic/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qmakeHook, exiv2 }:
{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
stdenv.mkDerivation rec {
name = "phototonic-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ qtbase exiv2 ];
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
preConfigure = ''
sed -i 's;/usr;$$PREFIX/;g' phototonic.pro
pkgs/applications/graphics/rapcad/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
, qtbase, qmakeHook, mesa_glu
, qtbase, qmake, mesa_glu
}:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
meta = with stdenv.lib; {
pkgs/applications/misc/calibre/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp
, xdg_utils, makeDesktopItem, wrapGAppsHook
}:
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
buildInputs = [
poppler_utils libpng imagemagick libjpeg
pkgs/applications/misc/cool-retro-term/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
qtquickcontrols, qtgraphicaleffects, qmakeHook }:
qtquickcontrols, qtgraphicaleffects, qmake }:
stdenv.mkDerivation rec {
version = "1.0.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
nativeBuildInputs = [ makeQtWrapper qmake ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
pkgs/applications/misc/golden-cheetah/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
, yacc, flex, zlib, config, qmakeHook, makeQtWrapper
, yacc, flex, zlib, config, qmake, makeQtWrapper
}:
stdenv.mkDerivation rec {
name = "golden-cheetah-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
qtconnectivity
];
nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs;
nativeBuildInputs = [ makeQtWrapper qmake ] ++ qtInputs;
preConfigure = ''
cp src/gcconfig.pri.in src/gcconfig.pri
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
pkgs/applications/misc/goldendict/default.nix
+6 -3
View File
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell
, libao, ffmpeg, libeb, lzo, xz, libtiff
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmakeHook }:
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
stdenv.mkDerivation rec {
name = "goldendict-1.5.0.rc2";
src = fetchurl {
url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz";
@@ -9,10 +10,12 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb
lzo xz libtiff qmakeHook
pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools
libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
];
nativeBuildInputs = [ qmake ];
qmakeFlags = [ "CONFIG+=zim_support" ];
meta = {
pkgs/applications/misc/gpxsee/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qmakeHook, qtbase, qttools, makeQtWrapper }:
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, makeQtWrapper }:
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
};
nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ];
nativeBuildInputs = [ qmake qttools makeQtWrapper ];
preConfigure = ''
substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
pkgs/applications/misc/openbrf/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmakeHook, makeQtWrapper, mesa }:
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, makeQtWrapper, mesa }:
stdenv.mkDerivation {
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
};
buildInputs = [ qtbase vcg glew ];
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake makeQtWrapper ];
qmakeFlags = [ "openBrf.pro" ];
pkgs/applications/misc/qtpass/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmake }:
stdenv.mkDerivation rec {
name = "qtpass-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
nativeBuildInputs = [ makeQtWrapper qmake ];
preConfigure = ''
qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
pkgs/applications/misc/redis-desktop-manager/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchgit, pkgconfig , libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
, qtsvg, qttools, qtquick1
, makeQtWrapper, qmakeHook
, makeQtWrapper, qmake
}:
let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
};
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
nativeBuildInputs = [ makeQtWrapper qmake ];
buildInputs = [
pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
pkgs/applications/misc/twmn/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmakeHook, pkgconfig, boost }:
{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
stdenv.mkDerivation rec {
name = "twmn-git-2014-09-23";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1a68gka9gyxyzhc9rn8df59rzcdwkjw90cxp1kk0rdfp6svhxhsa";
};
buildInputs = [ qtbase qtx11extras pkgconfig boost qmakeHook ];
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ qtbase qtx11extras boost ];
postPatch = ''
sed -i s/-Werror// twmnd/twmnd.pro
pkgs/applications/networking/instant-messengers/ricochet/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
, openssl, protobuf, qmakeHook
, openssl, protobuf, qmake
}:
stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
openssl protobuf
];
nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ];
nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, qtimageformats, qtgraphicaleffects, qtwebkit
, telegram-qml, libqtelegram-aseman-edition
, gst_all_1
, makeQtWrapper, qmakeHook }:
, makeQtWrapper, qmake }:
stdenv.mkDerivation rec {
name = "cutegram-${meta.version}";
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
telegram-qml libqtelegram-aseman-edition
] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]);
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
enableParallelBuilding = true;
nativeBuildInputs = [ makeQtWrapper qmake ];
fixupPhase = ''
wrapQtProgram $out/bin/cutegram \
pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, qtbase, qtmultimedia, qtquick1, qmakeHook }:
, qtbase, qtmultimedia, qtquick1, qmake }:
stdenv.mkDerivation rec {
name = "libqtelegram-aseman-edition-${meta.version}";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [ qtbase qtmultimedia qtquick1 ];
nativeBuildInputs = [ qmakeHook ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ];
patchPhase = ''
substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" ""
pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, qtbase, qtmultimedia, qtquick1, qmakeHook
, qtbase, qtmultimedia, qtquick1, qmake
, libqtelegram-aseman-edition }:
stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
nativeBuildInputs = [ qmakeHook ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake ];
patchPhase = ''
substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" ""
pkgs/applications/networking/instant-messengers/tensor/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }:
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }:
stdenv.mkDerivation rec {
name = "tensor-git-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ qtbase qtquickcontrols ];
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
nativeBuildInputs = [ qmake makeQtWrapper ];
desktopItem = makeDesktopItem {
name = "tensor";
pkgs/applications/networking/irc/communi/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmakeHook, stdenv }:
{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmake, stdenv }:
stdenv.mkDerivation rec {
name = "communi-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ makeQtWrapper qmakeHook ];
nativeBuildInputs = [ makeQtWrapper qmake ];
buildInputs = [ libcommuni qtbase ];
pkgs/applications/networking/linssid/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qtsvg, qmakeHook, pkgconfig, boost, wirelesstools, iw, qwt6 }:
{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }:
stdenv.mkDerivation rec {
name = "linssid-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
};
buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 qmakeHook ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 ];
patches = [ ./0001-unbundled-qwt.patch ];
pkgs/applications/networking/mumble/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ let
patches = optional jackSupport ./mumble-jack-support.patch;
nativeBuildInputs = [ pkgconfig python ]
++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}"
++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}"
++ (overrides.nativeBuildInputs or [ ]);
buildInputs = [ boost protobuf avahi ]
++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
pkgs/applications/networking/newsreaders/quiterss/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qt5, qmakeHook, makeQtWrapper, pkgconfig, sqlite }:
{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, makeQtWrapper, pkgconfig, sqlite }:
stdenv.mkDerivation rec {
name = "quiterss-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
};
buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ];
nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
postInstall = ''
wrapQtProgram "$out/bin/quiterss"
pkgs/applications/networking/p2p/qbittorrent/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, which
, boost, libtorrentRasterbar, qmakeHook, qt5
, boost, libtorrentRasterbar, qmake, qtbase, qttools
, debugSupport ? false # Debugging
, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn";
};
nativeBuildInputs = [ pkgconfig which ];
nativeBuildInputs = [ pkgconfig which qmake ];
buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
++ optional guiSupport dbus_libs;
preConfigure = ''
pkgs/applications/office/cb2bib/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
{ stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
stdenv.mkDerivation rec {
name = pname + "-" + version;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
};
buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
configurePhase = ''
runHook preConfigure
pkgs/applications/office/mytetra/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qmakeHook, makeQtWrapper, qtsvg }:
{ stdenv, fetchurl, qmake, makeQtWrapper, qtsvg }:
let
version = "1.42.2";
@@ -9,7 +9,8 @@ in stdenv.mkDerivation rec {
sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
};
buildInputs = [ qmakeHook makeQtWrapper qtsvg ];
nativeBuildInputs = [ makeQtWrapper qmake ];
buildInputs = [ qtsvg ];
hardeningDisable = [ "format" ];
pkgs/applications/science/electronics/fritzing/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmakeHook, pkgconfig
{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmake, pkgconfig
, qtbase, qtsvg, qtserialport, boost, libgit2
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
qmakeFlags = [ "phoenix.pro" ];
pkgs/applications/science/robotics/qgroundcontrol/default.nix
+8 -12
View File
@@ -1,19 +1,16 @@
{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
, makeQtWrapper, lndir
, gst_all_1, qt-gstreamer1, pkgconfig, glibc
, version ? "2.9.4"
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
, makeQtWrapper, lndir
, gst_all_1, qt-gstreamer1, pkgconfig, glibc
, version ? "2.9.4"
}:
stdenv.mkDerivation rec {
name = "qgroundcontrol-${version}";
buildInputs = [
SDL udev doxygen git
] ++ gstInputs;
qtInputs = [
qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
qtquick1 qtquickcontrols qtgraphicaleffects
];
@@ -22,9 +19,8 @@ stdenv.mkDerivation rec {
];
enableParallelBuilding = true;
nativeBuildInputs = [
pkgconfig makeQtWrapper qmakeHook
] ++ qtInputs;
buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
postPatch = ''
pkgs/applications/video/bomi/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper
, libX11, libxcb, mesa
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
, libchardet
, ffmpeg
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmakeHook ];
nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmake ];
enableParallelBuilding = true;
pkgs/applications/video/shotcut/default.nix
+7 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
qtgraphicaleffects,
qmakeHook, makeQtWrapper }:
qmake, makeQtWrapper }:
stdenv.mkDerivation rec {
name = "shotcut-${version}";
@@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr";
};
buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
qtx11extras qtwebsockets qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ];
enableParallelBuilding = true;
nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
buildInputs = [
SDL frei0r gettext mlt
qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
qtgraphicaleffects
];
prePatch = ''
sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
pkgs/applications/video/smplayer/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qmakeHook, qtscript }:
{ stdenv, fetchurl, qmake, qtscript }:
stdenv.mkDerivation rec {
name = "smplayer-17.6.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ qtscript ];
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
dontUseQmakeConfigure = true;
pkgs/applications/video/smtube/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
{ stdenv, fetchurl, qmake, qtscript, qtwebkit }:
stdenv.mkDerivation rec {
version = "17.5.0";
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
dontUseQmakeConfigure = true;
buildInputs = [ qmakeHook qtscript qtwebkit ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtscript qtwebkit ];
meta = with stdenv.lib; {
description = "Play and download Youtube videos";
pkgs/applications/video/vokoscreen/default.nix
+2 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchgit
, pkgconfig, qtbase, qttools, qmakeHook, qtx11extras, alsaLib, libv4l, libXrandr
, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr
, ffmpeg
}:
@@ -11,13 +11,12 @@ stdenv.mkDerivation {
sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
};
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
alsaLib
libv4l
pkgconfig
qtbase
qttools
qmakeHook
qtx11extras
libXrandr
];
pkgs/data/documentation/zeal/default.nix
+3 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }:
, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmake }:
stdenv.mkDerivation rec {
version = "0.3.1";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "14ld7zm15677jdlasnfa6c42kiswd4d6yg1db50xbk2yflzzwqqa";
};
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive qmakeHook
xcbutilkeysyms qtbase qtimageformats qtwebkit qtx11extras libarchive
];
qmakeFlags = [ "PREFIX=/" ];
pkgs/desktops/lumina/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, oxygen-icons5
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
qmakeHook
qmake
qttools
];
pkgs/development/libraries/accounts-qt/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmakeHook }:
{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }:
stdenv.mkDerivation rec {
name = "accounts-qt-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ glib libaccounts-glib qtbase ];
nativeBuildInputs = [ doxygen pkgconfig qmakeHook ];
nativeBuildInputs = [ doxygen pkgconfig qmake ];
preConfigure = ''
qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake"
pkgs/development/libraries/libcommuni/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmakeHook, which
{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmake, which
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ qmakeHook which ];
nativeBuildInputs = [ qmake which ];
enableParallelBuilding = true;
pkgs/development/libraries/libkeyfinder/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, qtbase, qmakeHook }:
{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
stdenv.mkDerivation rec {
name = "libkeyfinder-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
owner = "ibsh";
};
buildInputs = [ fftw qtbase qmakeHook ];
nativeBuildInputs = [ qmake ];
buildInputs = [ fftw qtbase ];
postPatch = ''
substituteInPlace LibKeyFinder.pro \
pkgs/development/libraries/qmltermwidget/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook, qtmultimedia }:
{ stdenv, fetchgit, qtbase, qtquick1, qmake, qtmultimedia }:
stdenv.mkDerivation rec {
version = "0.1.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ qtbase qtquick1 qtmultimedia ];
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
patchPhase = ''
substituteInPlace qmltermwidget.pro \
pkgs/development/libraries/qscintilla/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, unzip
, qt4 ? null, qmake4Hook ? null
, withQt5 ? false, qtbase ? null, qmakeHook ? null
, withQt5 ? false, qtbase ? null, qmake ? null
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]);
nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
enableParallelBuilding = true;
pkgs/development/libraries/qt-5/5.6/default.nix
+2 -2
View File
@@ -57,7 +57,7 @@ let
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
nativeBuildInputs =
(args.nativeBuildInputs or [])
++ [ perl self.qmakeHook ];
++ [ perl self.qmake ];
NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
@@ -127,7 +127,7 @@ let
{ deps = [ makeWrapper ]; }
(if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
qmakeHook =
qmake =
makeSetupHook
{ deps = [ self.qtbase.dev ]; }
(if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
pkgs/development/libraries/qt-5/5.8/default.nix
+2 -2
View File
@@ -48,7 +48,7 @@ let
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
nativeBuildInputs =
(args.nativeBuildInputs or [])
++ [ perl self.qmakeHook ];
++ [ perl self.qmake ];
NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
@@ -114,7 +114,7 @@ let
{ deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
(if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
qmakeHook =
qmake =
makeSetupHook
{ deps = [ self.qtbase.dev ]; }
(if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
pkgs/development/libraries/qtinstaller/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmakeHook }:
{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
stdenv.mkDerivation rec {
name = "qtinstaller";
propagatedBuildInputs = [qtdeclarative qttools];
nativeBuildInputs = [ qmakeHook ];
propagatedBuildInputs = [ qtdeclarative qttools ];
nativeBuildInputs = [ qmake ];
version = "2.0.3";
src = fetchurl {
pkgs/development/libraries/qtstyleplugins/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qmakeHook, qtbase, pkgconfig, gtk2 }:
{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }:
stdenv.mkDerivation rec {
name = "qtstyleplugins-2017-03-11";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy";
};
buildInputs = [ qmakeHook pkgconfig gtk2 ];
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ gtk2 ];
installPhase = ''
make INSTALL_ROOT=$NIX_QT5_TMP install
pkgs/development/libraries/qtwebkit-plugins/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qmakeHook, qtwebkit, hunspell }:
{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
stdenv.mkDerivation {
name = "qtwebkit-plugins-2015-05-09";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m";
};
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtwebkit hunspell ];
pkgs/development/libraries/quazip/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, zip, zlib, qtbase, qmakeHook }:
{ fetchurl, stdenv, zip, zlib, qtbase, qmake }:
stdenv.mkDerivation rec {
name = "quazip-0.7.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
preConfigure = "cd quazip";
buildInputs = [ zlib qtbase ];
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
meta = {
description = "Provides access to ZIP archives from Qt programs";
pkgs/development/libraries/qwt/6.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook }:
{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
stdenv.mkDerivation rec {
name = "qwt-6.1.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [ qtbase qtsvg qttools ];
nativeBuildInputs = [ qmakeHook ];
nativeBuildInputs = [ qmake ];
postPatch = ''
sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
pkgs/development/python-modules/pyqt/5.x.nix
+4 -3
View File
@@ -1,5 +1,5 @@
{ lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
, lndir, makeWrapper, qmakeHook }:
, lndir, makeWrapper, qmake }:
let
version = "5.8.1";
@@ -21,9 +21,10 @@ in buildPythonPackage {
sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy";
};
nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
buildInputs = [
pkgconfig makeWrapper lndir
qtbase qtsvg qtwebkit qtwebengine dbus_libs qmakeHook
lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
];
propagatedBuildInputs = [ sip ];
pkgs/development/qtcreator/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmakeHook
, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmake
, withDocumentation ? false
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
nativeBuildInputs = [ qmakeHook makeQtWrapper makeWrapper ];
nativeBuildInputs = [ qmake makeQtWrapper makeWrapper ];
doCheck = true;
pkgs/development/tools/analysis/qcachegrind/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qmakeHook, makeQtWrapper, qtbase, perl, python, php }:
{ stdenv, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }:
stdenv.mkDerivation rec {
name = "qcachegrind-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase perl python php ];
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
nativeBuildInputs = [ qmake makeQtWrapper ];
postInstall = ''
mkdir -p $out/bin
pkgs/games/chessx/default.nix
+2 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }:
{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
stdenv.mkDerivation rec {
name = "chessx-${version}";
version = "1.4.0";
@@ -7,15 +7,13 @@ stdenv.mkDerivation rec {
sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74";
};
buildInputs = [
stdenv
pkgconfig
qtbase
qtsvg
qttools
qtmultimedia
zlib
qmakeHook
];
nativeBuildInputs = [ pkgconfig qmake ];
# RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm'
#enableParallelBuilding = true;
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }:
{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }:
stdenv.mkDerivation rec {
name = "dwarf-therapist-original-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "layouts" ];
buildInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ texlive qmakeHook ];
nativeBuildInputs = [ texlive qmake ];
enableParallelBuilding = false;
pkgs/games/mudlet/default.nix
+4 -3
View File
@@ -1,5 +1,5 @@
{ fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell
, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmakeHook }:
, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmake }:
stdenv.mkDerivation rec {
name = "mudlet-${version}";
@@ -10,9 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7";
};
nativeBuildInputs = [ makeWrapper qmake ];
buildInputs = [
unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper
luafilesystem luazip lrexlib luasqlite3 qmakeHook
unzip qtbase lua5_1 hunspell libzip yajl boost
luafilesystem luazip lrexlib luasqlite3
];
preConfigure = "cd src";
pkgs/os-specific/linux/wpa_supplicant/gui.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qmakeHook, inkscape, imagemagick, wpa_supplicant }:
{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
stdenv.mkDerivation {
name = "wpa_gui-${wpa_supplicant.version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
inherit (wpa_supplicant) src;
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmakeHook inkscape imagemagick ];
nativeBuildInputs = [ qmake inkscape imagemagick ];
prePatch = ''
cd wpa_supplicant/wpa_gui-qt4
pkgs/tools/misc/ckb/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmakeHook, zlib }:
{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }:
stdenv.mkDerivation rec {
version = "0.2.6";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig
qmakeHook
qmake
];
patches = [
pkgs/tools/misc/qt5ct/default.nix
+3 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper }:
{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, makeQtWrapper }:
stdenv.mkDerivation rec {
name = "qt5ct-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f";
};
nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
propagatedBuildInputs = [ qtbase qtsvg qttools ];
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtsvg ];
pkgs/tools/misc/radeon-profile/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeQtWrapper, libXrandr }:
{ stdenv, fetchFromGitHub, qtbase, qmake, makeQtWrapper, libXrandr }:
stdenv.mkDerivation rec {
name = "radeon-profile-${version}";
version = "20161221";
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
nativeBuildInputs = [ qmake makeQtWrapper ];
buildInputs = [ qtbase libXrandr ];
src = (fetchFromGitHub {
pkgs/tools/misc/rockbox-utility/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libusb1
, qtbase, qttools, makeQtWrapper, qmakeHook
, qtbase, qttools, makeQtWrapper, qmake
, withEspeak ? false, espeak ? null }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libusb1 qtbase qttools ]
++ stdenv.lib.optional withEspeak espeak;
nativeBuildInputs = [ makeQtWrapper pkgconfig qmakeHook ];
nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
preConfigure = ''
cd rbutil/rbutilqt
pkgs/tools/networking/cmst/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }:
{ stdenv, fetchFromGitHub, qtbase, qmake, makeWrapper, libX11 }:
stdenv.mkDerivation rec {
name = "cmst-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0lsg8ya36df48ij0jawgli3f63hy6mn9zcla48whb1l4r7cih545";
};
nativeBuildInputs = [ makeWrapper qmakeHook ];
nativeBuildInputs = [ makeWrapper qmake ];
buildInputs = [ qtbase ];
pkgs/top-level/all-packages.nix
+2 -2
View File
@@ -4049,7 +4049,7 @@ with pkgs;
};
quazip_qt4 = libsForQt5.quazip.override {
qtbase = qt4; qmakeHook = qmake4Hook;
qtbase = qt4; qmake = qmake4Hook;
};
scrot = callPackage ../tools/graphics/scrot { };
@@ -15665,7 +15665,7 @@ with pkgs;
rofi-menugen = callPackage ../applications/misc/rofi-menugen { };
rstudio = callPackage ../applications/editors/rstudio { };
rstudio = libsForQt5.callPackage ../applications/editors/rstudio { };
rsync = callPackage ../applications/networking/sync/rsync {
enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);