diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-22 13:39:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 13:39:46 -0400 |
| commit | b4d5dd861ba760dc35aab0a070bd6b747773565e (patch) | |
| tree | 9906acf352ff73dd8122a02e44226408fad673a2 /pkgs/tools | |
| parent | e323fbabba9c3aed2661d0f3c4f4e0e0620d335d (diff) | |
| parent | d5b14e58c4c76ed4387a174b284f111c2260a01e (diff) | |
| download | nixlib-b4d5dd861ba760dc35aab0a070bd6b747773565e.tar nixlib-b4d5dd861ba760dc35aab0a070bd6b747773565e.tar.gz nixlib-b4d5dd861ba760dc35aab0a070bd6b747773565e.tar.bz2 nixlib-b4d5dd861ba760dc35aab0a070bd6b747773565e.tar.lz nixlib-b4d5dd861ba760dc35aab0a070bd6b747773565e.tar.xz nixlib-b4d5dd861ba760dc35aab0a070bd6b747773565e.tar.zst nixlib-b4d5dd861ba760dc35aab0a070bd6b747773565e.zip | |
Merge pull request #84673 from mmilata/qt5-mkDerivation-stdenv
Use qt5's mkDerivation in packages that otherwise crash
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/backup/httrack/qt.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/backup/luckybackup/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/rocket/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/colord-kde/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/glogg/default.nix | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index fe5b965e5707..6ee7f6e6a210 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, makeWrapper , httrack, qtbase, qtmultimedia }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "httraqt"; version = "1.4.9"; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 3e89be15391f..7203ba480e60 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl +{ mkDerivation, stdenv, fetchurl , pkgconfig, libtool, qmake , rsync, ssh }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index 97c400fbc9e3..683a2c73f454 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation { +mkDerivation { pname = "rocket"; version = "2018-06-09"; diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 8897514783aa..33686498112b 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl +{ mkDerivation, lib, fetchurl , extra-cmake-modules, ki18n , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem , kitemviews, lcms2, libXrandr, qtx11extras }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "colord-kde"; version = "0.5.0"; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 9dec057dfe9f..90c1419ef30e 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, qmake, boost }: +{ mkDerivation, stdenv, fetchurl, qmake, boost }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "glogg"; version = "1.1.4"; |