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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2021-01-24 20:41:42 +01:00
parent 09e2990117 27955d37e9
commit cc8fd11ffb
631 changed files with 2683 additions and 2201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/video/rtmpdump/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation {
})
];
makeFlags = [ ''prefix=$(out)'' ]
makeFlags = [ "prefix=$(out)" ]
++ optional gnutlsSupport "CRYPTO=GNUTLS"
++ optional opensslSupport "CRYPTO=OPENSSL"
++ optional stdenv.isDarwin "SYS=darwin"