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

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
32 changed files with 73 additions and 70 deletions
+2 -2
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";
version = "1.4";
+2 -2
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 }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "yabause";
version = "0.9.15";