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

Merge pull request #84673 from mmilata/qt5-mkDerivation-stdenv

Browse Source 
Use qt5's mkDerivation in packages that otherwise crash
This commit is contained in:
worldofpeace 2020-04-22 13:39:46 -04:00 committed by GitHub
commit b4d5dd861b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/dfasma/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: { mkDerivation, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
let let
@ -26,7 +26,7 @@ let
}; };
}; };
in stdenv.mkDerivation rec { in mkDerivation rec {
pname = "dfasma"; pname = "dfasma";
version = "1.4.5"; version = "1.4.5";

4
pkgs/applications/audio/iannix/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake { mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
}: }:
stdenv.mkDerivation { mkDerivation {
pname = "iannix"; pname = "iannix";
version = "2016-01-31"; version = "2016-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {

4
pkgs/applications/audio/traverso/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, pkgconfig { mkDerivation, stdenv, fetchurl, cmake, pkgconfig
, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
}: }:
stdenv.mkDerivation { mkDerivation {
pname = "traverso"; pname = "traverso";
version = "0.49.6"; version = "0.49.6";

4
pkgs/applications/editors/mindforger/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, qmake, qtbase, qtwebkit }: { mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "mindforger"; pname = "mindforger";
version = "1.48.2"; version = "1.48.2";

4
pkgs/applications/editors/okteta/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig { mkDerivation, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts
, qca-qt5, shared-mime-info }: , qca-qt5, shared-mime-info }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "okteta"; pname = "okteta";
version = "0.26.3"; version = "0.26.3";

11
pkgs/applications/graphics/awesomebump/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }: { mkDerivation, lib, fetchgit, qtbase, qmake, qtscript, flex, bison, qtdeclarative }:
let let
@ -11,7 +11,7 @@ let
fetchSubmodules = true; fetchSubmodules = true;
}; };
qtnproperty = stdenv.mkDerivation { qtnproperty = mkDerivation {
name = "qtnproperty"; name = "qtnproperty";
inherit src; inherit src;
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
@ -22,7 +22,7 @@ let
install -D bin-linux/QtnPEG $out/bin/QtnPEG install -D bin-linux/QtnPEG $out/bin/QtnPEG
''; '';
}; };
in stdenv.mkDerivation { in mkDerivation {
pname = "awesomebump"; pname = "awesomebump";
inherit version; inherit version;
@ -30,12 +30,13 @@ in stdenv.mkDerivation {
buildInputs = [ qtbase qtscript qtdeclarative ]; buildInputs = [ qtbase qtscript qtdeclarative ];
nativeBuildInputs = [ qmake makeWrapper ]; nativeBuildInputs = [ qmake ];
preBuild = '' preBuild = ''
ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
''; '';
dontWrapQtApps = true;
postInstall = '' postInstall = ''
d=$out/libexec/AwesomeBump d=$out/libexec/AwesomeBump
@ -44,7 +45,7 @@ in stdenv.mkDerivation {
cp -prd Bin/Configs Bin/Core $d/ cp -prd Bin/Configs Bin/Core $d/
# AwesomeBump expects to find Core and Configs in its current directory. # AwesomeBump expects to find Core and Configs in its current directory.
makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ makeQtWrapper $d/AwesomeBump $out/bin/AwesomeBump \
--run "cd $d" --run "cd $d"
''; '';

4
pkgs/applications/graphics/phototonic/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: { mkDerivation, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "phototonic"; pname = "phototonic";
version = "2.1"; version = "2.1";

4
pkgs/applications/graphics/qcomicbook/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: { mkDerivation, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "qcomicbook"; pname = "qcomicbook";
version = "0.9.1"; version = "0.9.1";

4
pkgs/applications/graphics/write_stylus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: { mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
let let
# taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
# license: Free for commercial use # license: Free for commercial use
@ -7,7 +7,7 @@ let
sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8"; sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8";
}; };
in in
stdenv.mkDerivation rec { mkDerivation rec {
pname = "write_stylus"; pname = "write_stylus";
version = "209"; version = "209";

4
pkgs/applications/misc/bibletime/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core { mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
, qtbase, qttools, qtsvg, qtwebkit , qtbase, qttools, qtsvg, qtwebkit
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
version = "2.11.2"; version = "2.11.2";

4
pkgs/applications/misc/candle/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: { mkDerivation, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "candle"; pname = "candle";
version = "1.1"; version = "1.1";

4
pkgs/applications/misc/openbrf/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: { mkDerivation, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
stdenv.mkDerivation { mkDerivation {
name = "openbrf-unstable-2016-01-09"; name = "openbrf-unstable-2016-01-09";
src = fetchFromGitHub { src = fetchFromGitHub {

5
pkgs/applications/misc/qt-box-editor/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv { mkDerivation
, stdenv
, fetchFromGitHub , fetchFromGitHub
, qtbase , qtbase
, qtsvg , qtsvg
@ -7,7 +8,7 @@
, tesseract , tesseract
}: }:
stdenv.mkDerivation { mkDerivation {
pname = "qt-box-editor"; pname = "qt-box-editor";
version = "unstable-2019-07-12"; version = "unstable-2019-07-12";

4
pkgs/applications/misc/valentina/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchhg { mkDerivation, stdenv, fetchhg
, qmake, qttools , qmake, qttools
, qtbase, qtsvg, qtxmlpatterns , qtbase, qtsvg, qtxmlpatterns
, poppler_utils , poppler_utils
@ -6,7 +6,7 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { mkDerivation rec {
pname = "valentina"; pname = "valentina";
version = "0.6.1"; version = "0.6.1";

4
pkgs/applications/networking/instant-messengers/ricochet/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, makeDesktopItem { mkDerivation, stdenv, fetchurl, pkgconfig, makeDesktopItem
, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
, openssl, protobuf, qmake , openssl, protobuf, qmake
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "ricochet"; pname = "ricochet";
version = "1.1.4"; version = "1.1.4";

4
pkgs/applications/networking/instant-messengers/swift-im/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, qttools, scons { mkDerivation, stdenv, fetchurl, pkgconfig, qttools, scons
, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "swift-im"; pname = "swift-im";
version = "4.0.2"; version = "4.0.2";

4
pkgs/applications/networking/instant-messengers/tensor/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: { mkDerivation, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
# we now have libqmatrixclient so a future version of tensor that supports it # we now have libqmatrixclient so a future version of tensor that supports it
# should use that # should use that
stdenv.mkDerivation rec { mkDerivation rec {
pname = "tensor-git"; pname = "tensor-git";
version = "2017-02-21"; version = "2017-02-21";

4
pkgs/applications/science/electronics/caneda/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: { mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "caneda"; pname = "caneda";
version = "0.3.1"; version = "0.3.1";

11
pkgs/applications/video/bomi/default.nix
View File

@ -1,7 +1,7 @@
{ config, stdenv, fetchFromGitHub { mkDerivation, config, stdenv, fetchFromGitHub
, fetchpatch, pkgconfig, perl, python, which , fetchpatch, pkgconfig, perl, python, which
, libX11, libxcb, libGLU, libGL , libX11, libxcb, libGLU, libGL
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
, libchardet , libchardet
, ffmpeg , ffmpeg
@ -29,7 +29,7 @@ assert pulseSupport -> libpulseaudio != null;
assert cddaSupport -> libcdda != null; assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null; assert youtubeSupport -> youtube-dl != null;
stdenv.mkDerivation rec { mkDerivation rec {
pname = "bomi"; pname = "bomi";
version = "0.9.11"; version = "0.9.11";
@ -90,8 +90,9 @@ stdenv.mkDerivation rec {
patchShebangs build-mpv patchShebangs build-mpv
''; '';
dontWrapQtApps = true;
postInstall = '' postInstall = ''
wrapProgram $out/bin/bomi \ wrapQtApp $out/bin/bomi \
${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
''; '';
@ -105,7 +106,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda" ++ optional cddaSupport "--enable-cdda"
; ;
nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ]; nativeBuildInputs = [ pkgconfig perl python which qttools qmake ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Powerful and easy-to-use multimedia player"; description = "Powerful and easy-to-use multimedia player";

4
pkgs/applications/video/qmediathekview/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: { mkDerivation, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "QMediathekView"; pname = "QMediathekView";
version = "2019-01-06"; version = "2019-01-06";

4
pkgs/applications/video/qstopmotion/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 { mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre , gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
, qwt, extra-cmake-modules }: , qwt, extra-cmake-modules }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "qstopmotion"; pname = "qstopmotion";
version = "2.4.1"; version = "2.4.1";

4
pkgs/applications/virtualization/aqemu/default.nix
View File

@ -1,7 +1,7 @@
{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv { mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "aqemu"; pname = "aqemu";
version = "0.9.2"; version = "0.9.2";

4
pkgs/games/enyo-doom/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, cmake, qtbase }: { mkDerivation, stdenv, fetchFromGitLab, cmake, qtbase }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "enyo-doom"; pname = "enyo-doom";
version = "1.06.9"; version = "1.06.9";

4
pkgs/games/pro-office-calculator/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: { mkDerivation, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }:
stdenv.mkDerivation rec { mkDerivation rec {
version = "1.0.13"; version = "1.0.13";
pname = "pro-office-calculator"; pname = "pro-office-calculator";

4
pkgs/misc/calaos/installer/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }: { mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }:
stdenv.mkDerivation rec { mkDerivation rec {
name = "calaos_installer-3.1"; name = "calaos_installer-3.1";
version = "3.1"; version = "3.1";

4
pkgs/misc/emulators/firebird-emu/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: { mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "firebird-emu"; pname = "firebird-emu";
version = "1.4"; version = "1.4";

4
pkgs/misc/emulators/yabause/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL { mkDerivation, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL
, freeglut ? null, openal ? null, SDL2 ? null }: , freeglut ? null, openal ? null, SDL2 ? null }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "yabause"; pname = "yabause";
version = "0.9.15"; version = "0.9.15";

4
pkgs/tools/backup/httrack/qt.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper { mkDerivation, stdenv, fetchurl, cmake, pkgconfig, makeWrapper
, httrack, qtbase, qtmultimedia }: , httrack, qtbase, qtmultimedia }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "httraqt"; pname = "httraqt";
version = "1.4.9"; version = "1.4.9";

4
pkgs/tools/backup/luckybackup/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl { mkDerivation, stdenv, fetchurl
, pkgconfig, libtool, qmake , pkgconfig, libtool, qmake
, rsync, ssh , rsync, ssh
}: }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { mkDerivation rec {
pname = "luckybackup"; pname = "luckybackup";
version = "0.5.0"; version = "0.5.0";

4
pkgs/tools/graphics/rocket/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qmake, qtbase }: { mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase }:
stdenv.mkDerivation { mkDerivation {
pname = "rocket"; pname = "rocket";
version = "2018-06-09"; version = "2018-06-09";

4
pkgs/tools/misc/colord-kde/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl { mkDerivation, lib, fetchurl
, extra-cmake-modules, ki18n , extra-cmake-modules, ki18n
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
, kitemviews, lcms2, libXrandr, qtx11extras , kitemviews, lcms2, libXrandr, qtx11extras
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "colord-kde"; pname = "colord-kde";
version = "0.5.0"; version = "0.5.0";

4
pkgs/tools/text/glogg/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, qmake, boost }: { mkDerivation, stdenv, fetchurl, qmake, boost }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "glogg"; pname = "glogg";
version = "1.1.4"; version = "1.1.4";