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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-20 09:12:42 -07:00
parent 24f13758b9 8aac6d8daf
commit 14f3686af1
120 changed files with 7535 additions and 2303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/devede/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor
{ lib, fetchFromGitLab, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
let
@@ -30,11 +30,11 @@ in buildPythonApplication rec {
];
buildInputs = [
ffmpeg_3
ffmpeg
];
propagatedBuildInputs = [
gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg_3 mplayer dvdauthor vcdimager cdrkit urllib3 setuptools
gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools
];
postPatch = ''