From 56127c23c2ce78f8ae31f6e935716e001dbfc16d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan <daiderd@gmail.com> Date: Wed, 19 Jun 2019 23:20:34 +0200 Subject: [PATCH] gargoyle: remove cf-private --- pkgs/games/gargoyle/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 62ea798e4656..83a567fa5782 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig -, SDL, SDL_mixer, SDL_sound, cf-private, gtk2, libvorbis, smpeg }: +, SDL, SDL_mixer, SDL_sound, gtk2, libvorbis, smpeg }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 125c89971aa2..6747577c2947 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21541,7 +21541,7 @@ in garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; gargoyle = callPackage ../games/gargoyle { - inherit (darwin) cctools cf-private; + inherit (darwin) cctools; }; gav = callPackage ../games/gav { };