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]
2021-02-08 12:19:33 +00:00
committed by GitHub
parent f6ef5ce473 078f893795
commit bef005163c
56 changed files with 580 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/screensavers/electricsheep/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl
, libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL
, glee }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
wxGTK30 libav lua5_1 curl libpng xorg.libXrender
wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender
flam3 libgtop boost tinyxml freeglut libGLU libGL glee
];