summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2019-06-19 23:19:13 +0200
committerDaiderd Jordan <daiderd@gmail.com>2019-07-03 22:20:22 +0200
commitbbf5f7e3dad2123c678bfdae70b3512f8133d3ad (patch)
tree1562cabcdc57e64aca65bfacee2997a92ebcb5a9
parentb0e201f349985d0357a89c7998352459266f80dd (diff)
downloadnixpkgs-bbf5f7e3dad2123c678bfdae70b3512f8133d3ad.tar
nixpkgs-bbf5f7e3dad2123c678bfdae70b3512f8133d3ad.tar.gz
nixpkgs-bbf5f7e3dad2123c678bfdae70b3512f8133d3ad.tar.bz2
nixpkgs-bbf5f7e3dad2123c678bfdae70b3512f8133d3ad.tar.lz
nixpkgs-bbf5f7e3dad2123c678bfdae70b3512f8133d3ad.tar.xz
nixpkgs-bbf5f7e3dad2123c678bfdae70b3512f8133d3ad.tar.zst
nixpkgs-bbf5f7e3dad2123c678bfdae70b3512f8133d3ad.zip
zola: remove cf-private
-rw-r--r--pkgs/applications/misc/zola/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 48f5b216ea1..7418640e072 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }:
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }:
 
 rustPlatform.buildRustPackage rec {
   pname = "zola";
@@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24";
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];
+  buildInputs = [ openssl ]
+    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
   postInstall = ''
     install -D -m 444 completions/zola.bash \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d2fee37f84..125c89971aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21270,7 +21270,6 @@ in
 
   zola = callPackage ../applications/misc/zola {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
-    inherit (darwin) cf-private;
   };
 
   zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { };