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:
github-actions[bot] 2020-12-24 12:25:42 +00:00 committed by GitHub
commit 5a0f398d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/audio/qjackctl/default.nix
View File

@ -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 { mkDerivation rec {
version = "0.6.3"; version = "0.6.3";
@ -20,9 +24,12 @@ mkDerivation rec {
dbus 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; { meta = with stdenv.lib; {
description = "A Qt application to control the JACK sound server daemon"; description = "A Qt application to control the JACK sound server daemon";

8
pkgs/applications/science/geometry/gama/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo }: { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gama"; pname = "gama";
version = "2.09"; version = "2.12";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9"; sha256 = "0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj";
}; };
buildInputs = [ expat ]; buildInputs = [ expat ];
nativeBuildInputs = [ texinfo ]; nativeBuildInputs = [ texinfo zip ];
checkInputs = [ octave libxml2 ]; checkInputs = [ octave libxml2 ];
doCheck = true; doCheck = true;

4
pkgs/development/python-modules/pybullet/default.nix
View File

@ -8,11 +8,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pybullet"; pname = "pybullet";
version = "3.0.7"; version = "3.0.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "47e55d2b0c565a968406f314faad7c002be6d8b0afc8ad2c437d07b7b7d2f590"; sha256 = "623061d305bd5513a911abb2cbd0e37670be166a270123b43ca757bf78e4b438";
}; };
buildInputs = [ buildInputs = [

8
pkgs/games/steam/steam.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, runtimeShell, traceDeps ? false}: { stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }:
let let
traceLog = "/tmp/steam-trace-dependencies.log"; traceLog = "/tmp/steam-trace-dependencies.log";
@ -27,6 +27,12 @@ in stdenv.mkDerivation {
chmod +x $out/bin/steamdeps 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" # this just installs a link, "steam.desktop -> /lib/steam/steam.desktop"
rm $out/share/applications/steam.desktop rm $out/share/applications/steam.desktop
sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop