Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
fc2a98b118
21 changed files with 663 additions and 640 deletions
|
|
@ -21,10 +21,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
|
||||
versions = {
|
||||
stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; };
|
||||
staging = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };
|
||||
latest = { version = "2.3.57.6"; sha256 = "sha256-ZCOtVmvNXDWLo9UMzxARCp+iyRTcy/ogd5sV0k86JG8="; };
|
||||
};
|
||||
|
||||
override = { version, sha256 }: super: {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -7,10 +7,10 @@ in
|
|||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
version = "94.0.1";
|
||||
version = "94.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "634665ed64f2ef205fad03ba023bc915df110c0d4b0a5e36aa470627808fbb3bce5418ea607f909d4e1eaf7d90c5dcacf398b8a434e26906dcfa366292a18b66";
|
||||
sha512 = "00ce4f6be711e1f309828e030163e61bbd9fe3364a8e852e644177c93832078877dea1a516719b106a52c0d8462193ed52c1d3cc7ae34ea021eb1dd0f5b685e2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
picom.overrideAttrs (oldAttrs: rec {
|
||||
pname = "picom-next";
|
||||
version = "unstable-2021-10-31";
|
||||
version = "unstable-2021-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "fade045eadf171d2c732820d6ebde7d1943a1397";
|
||||
sha256 = "fPiLZ63+Bw5VCxVNqj9i5had2YLa+jFMMf85MYdqvHU=";
|
||||
rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce";
|
||||
sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw=";
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, glib, gettext, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-caffeine";
|
||||
version = "38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eonpatapon";
|
||||
repo = "gnome-shell-extension-caffeine";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
extensionPortalSlug = "caffeine";
|
||||
extensionUuid = "caffeine@patapon.info";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib gettext
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${bash}/bin/bash ./update-locale.sh
|
||||
glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/gnome-shell/extensions
|
||||
cp -r "caffeine@patapon.info" $out/share/gnome-shell/extensions
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fill the cup to inhibit auto suspend and screensaver";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ eperuffo ];
|
||||
homepage = "https://github.com/eonpatapon/gnome-shell-extension-caffeine";
|
||||
};
|
||||
}
|
||||
|
|
@ -101,6 +101,10 @@
|
|||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com",
|
||||
"horizontal-workspace-indicator@tty2.io"
|
||||
],
|
||||
"disable-unredirect-fullscreen-windows": [
|
||||
"unredirect@vaina.lt",
|
||||
"unredirect@aunetx"
|
||||
],
|
||||
"floating-dock": [
|
||||
"floatingDock@sun.wxg@gmail.com",
|
||||
"floating-dock@nandoferreira_prof@hotmail.com"
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ in rec {
|
|||
(extensions: extensions // lib.optionalAttrs (config.allowAliases or true) {
|
||||
unite-shell = gnomeExtensions.unite; # added 2021-01-19
|
||||
arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
|
||||
disable-unredirect = gnomeExtensions.disable-unredirect-fullscreen-windows; # added 2021-11-20
|
||||
|
||||
nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks.";
|
||||
mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@
|
|||
# the upstream repository's sources.
|
||||
super: super // {
|
||||
|
||||
"caffeine@patapon.info" = super."caffeine@patapon.info".overrideAttrs (old: {
|
||||
meta.maintainers = with lib.maintainers; [ eperuffo ];
|
||||
});
|
||||
|
||||
"dash-to-dock@micxgx.gmail.com" = super."dash-to-dock@micxgx.gmail.com".overrideAttrs (old: {
|
||||
meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ];
|
||||
});
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@
|
|||
"workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
|
||||
"horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
|
||||
|
||||
"unredirect@vaina.lt" = "disable-unredirect-fullscreen-windows";
|
||||
"unredirect@aunetx" = "disable-unredirect-fullscreen-windows-2";
|
||||
|
||||
# ############################################################################
|
||||
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
|
||||
# Make sure to move them up once they are updated
|
||||
|
|
@ -71,7 +74,6 @@
|
|||
# These extensions are automatically packaged at the moment. We preserve the old attribute name
|
||||
# for backwards compatibility.
|
||||
"appindicatorsupport@rgcjonas.gmail.com" = "appindicator"; # extensionPortalSlug is "appindicator-support"
|
||||
"unredirect@vaina.lt" = "disable-unredirect"; # extensionPortalSlug is "disable-unredirect-fullscreen-windows"
|
||||
"drawOnYourScreen@abakkk.framagit.org" = "draw-on-your-screen"; # extensionPortalSlug is "draw-on-you-screen"
|
||||
"timepp@zagortenay333" = "timepp"; # extensionPortalSlug is "time"
|
||||
"windowIsReady_Remover@nunofarruca@gmail.com" = "window-is-ready-remover"; # extensionPortalSlug is "window-is-ready-notification-remover"
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,7 +1,6 @@
|
|||
{ callPackage }:
|
||||
{
|
||||
"arcmenu@arcmenu.com" = callPackage ./arcmenu { };
|
||||
"caffeine@patapon.info" = callPackage ./caffeine { };
|
||||
"clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { };
|
||||
"dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { };
|
||||
"drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { };
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, lib
|
||||
, config
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, alsaSupport ? stdenv.hostPlatform.isLinux
|
||||
|
|
@ -16,31 +15,16 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.1.0";
|
||||
pname = "rtaudio";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thestk";
|
||||
repo = "rtaudio";
|
||||
rev = version;
|
||||
sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52";
|
||||
sha256 = "0xvahlfj3ysgsjsp53q81hayzw7f99n1g214gh7dwdr52kv2l987";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes missing headers & install location
|
||||
# Drop with version > 5.1.0
|
||||
(fetchpatch {
|
||||
name = "RtAudio-Adjust-CMake-public-header-installs-to-match-autotools.patch";
|
||||
url = "https://github.com/thestk/rtaudio/commit/4273cf7572b8f51b5996cf6b42e3699cc6b165da.patch";
|
||||
sha256 = "1p0idll0xsfk3jwjg83jkxkaf20gk0wqa7l982ni389rn6i4n26p";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace rtaudio.pc.in \
|
||||
--replace 'Requires:' 'Requires.private:'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = lib.optional alsaSupport alsa-lib
|
||||
|
|
|
|||
|
|
@ -1,5 +1,15 @@
|
|||
{ buildPythonPackage, isPy3k, fetchFromGitHub, lib,
|
||||
z3, ply, igraph, oset, ordered-set, dictionaries, setuptools }:
|
||||
{ buildPythonPackage
|
||||
, isPy3k
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, z3
|
||||
, ply
|
||||
, igraph
|
||||
, oset
|
||||
, ordered-set
|
||||
, dictionaries
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "cozy";
|
||||
|
|
@ -7,7 +17,13 @@ buildPythonPackage {
|
|||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools z3 ply igraph oset ordered-set dictionaries
|
||||
setuptools
|
||||
z3
|
||||
ply
|
||||
igraph
|
||||
oset
|
||||
ordered-set
|
||||
dictionaries
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -17,9 +33,14 @@ buildPythonPackage {
|
|||
sha256 = "1jhr5gzihj8dkg0yc5dmi081v2isxharl0ph7v2grqj0bwqzl40j";
|
||||
};
|
||||
|
||||
# Yoink the Z3 dependency name, because our Z3 package doesn't provide it.
|
||||
# - yoink the Z3 dependency name, because our Z3 package doesn't provide it.
|
||||
# - remove "dictionaries" version bound
|
||||
# - patch igraph package name
|
||||
postPatch = ''
|
||||
sed -i -e '/z3-solver/d' -e 's/^dictionaries.*$/dictionaries/' requirements.txt
|
||||
sed -i -e '/z3-solver/d' \
|
||||
-e 's/^dictionaries.*$/dictionaries/' \
|
||||
-e 's/python-igraph/igraph/' \
|
||||
requirements.txt
|
||||
'';
|
||||
|
||||
# Tests are not correctly set up in the source tree.
|
||||
|
|
@ -32,10 +53,10 @@ buildPythonPackage {
|
|||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "The collection synthesizer";
|
||||
homepage = "https://cozy.uwplse.org/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.MostAwesomeDude ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ MostAwesomeDude ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyiqvia";
|
||||
version = "2021.10.0";
|
||||
version = "2021.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FCavSy33fkXlboRAmGr0BkEkXLTOzsyGXQkws0LqiJk=";
|
||||
sha256 = "sha256-Cqc3zRJ2VpKKCGF4y+4IYfvfANblCEmh0sJ3tXH1AAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyopenuv";
|
||||
version = "2021.10.0";
|
||||
version = "2021.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3zTyW3eXOA9frSAy4g7iWhymc1hBo0hrxIgPLMqrLTs=";
|
||||
sha256 = "sha256-J0YIq00/GcWEL23UHmN98Jp/imOAz8NLzhMdk8WFozk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,7 +43,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
"examples/"
|
||||
|
|
|
|||
|
|
@ -7,19 +7,26 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvesync";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f8bc6ebbe2c2bf37009b50b16e34747b0cfe35dd249aed4525b68c3af061941f";
|
||||
sha256 = "sha256-O5zt1FiCQAlCaGaiEyrannqZjm4oGq36d4Fa77ys+HE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Test are not available (not in PyPI tarball and there are no GitHub releases)
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pyvesync" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyvesync"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to manage Etekcity Devices and Levoit Air Purifier";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddosify";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kccn6tnJfy4mx0hyBi2ggPvNPu/iQgGBMxQ6hsYy7So=";
|
||||
sha256 = "sha256-RA+WmlSrNwkysuvAXjCoKZ528nt0tTZ5OHkqCETMskE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg=";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,26 @@
|
|||
{ lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
|
||||
, python, pkg-config, SDL2, SDL2_ttf, alsa-lib, which, qtbase, libXinerama
|
||||
, libpcap, CoreAudioKit, ForceFeedback
|
||||
, installShellFiles }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, CoreAudioKit
|
||||
, fetchFromGitHub
|
||||
, fontconfig
|
||||
, ForceFeedback
|
||||
, installShellFiles
|
||||
, libpcap
|
||||
, libpulseaudio
|
||||
, libXi
|
||||
, libXinerama
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, python3
|
||||
, qtbase
|
||||
, SDL2
|
||||
, SDL2_ttf
|
||||
, which
|
||||
}:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "226";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "MAME";
|
||||
exec = "mame${lib.optionalString stdenv.is64bit "64"}";
|
||||
|
|
@ -16,15 +30,16 @@ let
|
|||
};
|
||||
|
||||
dest = "$out/opt/mame";
|
||||
in mkDerivation {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mame";
|
||||
version = "${majorVersion}.${minorVersion}";
|
||||
version = "0.237";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${majorVersion}${minorVersion}";
|
||||
sha256 = "0pnsvz4vkjkqb1ac5wzwz31vx0iknyg5ffly90nhl13kcr656jrj";
|
||||
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
|
||||
sha256 = "sha256-0GOzpE8YP32ixz+c4dtDur9K0Szf7cl/dkWzPcJRFAM=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
|
@ -33,18 +48,19 @@ in mkDerivation {
|
|||
makeFlags = [
|
||||
"TOOLS=1"
|
||||
"USE_LIBSDL=1"
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [ "CC=clang" "CXX=clang++" ]
|
||||
;
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"CXX=${stdenv.cc.targetPrefix}c++"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# https://docs.mamedev.org/initialsetup/compilingmame.html
|
||||
buildInputs =
|
||||
[ SDL2 SDL2_ttf qtbase libXinerama ]
|
||||
++ lib.optional stdenv.isLinux alsa-lib
|
||||
++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]
|
||||
;
|
||||
nativeBuildInputs = [ python pkg-config which makeWrapper installShellFiles ];
|
||||
[ SDL2 SDL2_ttf qtbase ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ]
|
||||
++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ];
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config which makeWrapper installShellFiles ];
|
||||
|
||||
# by default MAME assumes that paths with stock resources
|
||||
# are relative and that you run MAME changing to
|
||||
|
|
@ -75,13 +91,15 @@ in mkDerivation {
|
|||
ln -s ${desktopItem}/share/applications $out/share
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Is a multi-purpose emulation framework";
|
||||
homepage = "https://www.mamedev.org/";
|
||||
license = with licenses; [ bsd3 gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
# makefile needs fixes for install target
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ thiagokokada ];
|
||||
# macOS needs more time to build
|
||||
timeout = 24 * 3600;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnsx";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "dnsx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rAicKytDtdnPwWdxJvBd5UnMGTAI4NHcPUjISlT7kCw=";
|
||||
sha256 = "sha256-92J9yRTSk2EP3lXCWH1+Ha+dx3dTNur6LIDMKbGmseI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8YoYfn2BFUnVwH9FcAgb1p5CV3dJVrWjEMPfivOGvQE=";
|
||||
vendorSha256 = "sha256-692PcWFYNInWcZm9NQHLQmRHGFV9XUSFoCqHo7fcGEU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and multi-purpose DNS toolkit";
|
||||
|
|
|
|||
|
|
@ -28206,7 +28206,7 @@ with pkgs;
|
|||
|
||||
super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { };
|
||||
|
||||
super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging;
|
||||
super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest;
|
||||
|
||||
snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };
|
||||
|
||||
|
|
@ -32363,6 +32363,12 @@ with pkgs;
|
|||
|
||||
mame = libsForQt514.callPackage ../misc/emulators/mame {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
|
||||
# TODO: remove it on mame 0.238
|
||||
stdenv =
|
||||
if stdenv.cc.isClang then
|
||||
overrideCC stdenv clang_6
|
||||
else
|
||||
stdenv;
|
||||
};
|
||||
|
||||
martyr = callPackage ../development/libraries/martyr { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue