b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #243782 from adisbladis/pict-rs-ffmpeg-5

Browse source 
pict-rs: Use main ffmpeg attribute
This commit is contained in:
adisbladis 2023-07-23 00:18:39 +12:00 committed by GitHub
parent 627e97eefa 71632b0dac
commit eb45d58c14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/web-apps/pict-rs/default.nix
View file

@ -4,7 +4,7 @@
, rustPlatform
, makeWrapper
, protobuf
, Security
, darwin
, imagemagick
, ffmpeg
, exiftool
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
PROTOC_INCLUDE = "${protobuf}/include";
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks ];
postInstall = ''
wrapProgram "$out/bin/pict-rs" \

5
pkgs/top-level/all-packages.nix
View file

@ -26435,10 +26435,7 @@ with pkgs;
petidomo = callPackage ../servers/mail/petidomo { };
pict-rs = callPackage ../servers/web-apps/pict-rs {
inherit (darwin.apple_sdk.frameworks) Security;
ffmpeg = ffmpeg_4;
};
pict-rs = callPackage ../servers/web-apps/pict-rs { };
pict-rs_0_3 = callPackage ../servers/web-apps/pict-rs/0.3.nix {
inherit (darwin.apple_sdk.frameworks) Security;