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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-04-23 08:11:16 +02:00
parent aa272d8e82 994e4b8d2d
commit cff0669a48
73 changed files with 5098 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/firebird-emu/default.nix
+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";
pkgs/misc/emulators/yabause/default.nix
+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";