From 71632b0dace3db1ac9a1a459e49b2f52a018861c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 16 Jul 2023 20:24:02 +1200 Subject: [PATCH] pict-rs: Use main ffmpeg attribute Don't build against ffmpeg-4. --- pkgs/servers/web-apps/pict-rs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 30d9c002ca3c..d569fdfbb594 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -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" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bc30d8e8e76..ef1e2ddd31d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26346,10 +26346,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;