Merge staging-next into staging
This commit is contained in:
commit
8d42e46e8e
|
@ -1,4 +1,8 @@
|
|||
{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
|
||||
{ stdenv, mkDerivation, fetchurl
|
||||
, pkg-config, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras
|
||||
# Enable jack session support
|
||||
, jackSession ? false
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "0.6.3";
|
||||
|
@ -20,9 +24,12 @@ mkDerivation rec {
|
|||
dbus
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
configureFlags = [ "--enable-jack-version" ];
|
||||
configureFlags = [
|
||||
"--enable-jack-version"
|
||||
(stdenv.lib.strings.enableFeature jackSession "jack-session")
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Qt application to control the JACK sound server daemon";
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo }:
|
||||
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gama";
|
||||
version = "2.09";
|
||||
version = "2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9";
|
||||
sha256 = "0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj";
|
||||
};
|
||||
|
||||
buildInputs = [ expat ];
|
||||
|
||||
nativeBuildInputs = [ texinfo ];
|
||||
nativeBuildInputs = [ texinfo zip ];
|
||||
|
||||
checkInputs = [ octave libxml2 ];
|
||||
doCheck = true;
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybullet";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "47e55d2b0c565a968406f314faad7c002be6d8b0afc8ad2c437d07b7b7d2f590";
|
||||
sha256 = "623061d305bd5513a911abb2cbd0e37670be166a270123b43ca757bf78e4b438";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, runtimeShell, traceDeps ? false}:
|
||||
{ stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }:
|
||||
|
||||
let
|
||||
traceLog = "/tmp/steam-trace-dependencies.log";
|
||||
|
@ -27,6 +27,12 @@ in stdenv.mkDerivation {
|
|||
chmod +x $out/bin/steamdeps
|
||||
''}
|
||||
|
||||
# install udev rules
|
||||
mkdir -p $out/etc/udev/rules.d/
|
||||
cp ./subprojects/steam-devices/*.rules $out/etc/udev/rules.d/
|
||||
substituteInPlace $out/etc/udev/rules.d/60-steam-input.rules \
|
||||
--replace "/bin/sh" "${bash}/bin/bash"
|
||||
|
||||
# this just installs a link, "steam.desktop -> /lib/steam/steam.desktop"
|
||||
rm $out/share/applications/steam.desktop
|
||||
sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop
|
||||
|
|
Loading…
Reference in a new issue