diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 23:20:34 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:22 +0200 |
commit | 56127c23c2ce78f8ae31f6e935716e001dbfc16d (patch) | |
tree | 2ad117ac29ff321dad41d963ab4e800ea5363248 | |
parent | bbf5f7e3dad2123c678bfdae70b3512f8133d3ad (diff) | |
download | nixpkgs-56127c23c2ce78f8ae31f6e935716e001dbfc16d.tar nixpkgs-56127c23c2ce78f8ae31f6e935716e001dbfc16d.tar.gz nixpkgs-56127c23c2ce78f8ae31f6e935716e001dbfc16d.tar.bz2 nixpkgs-56127c23c2ce78f8ae31f6e935716e001dbfc16d.tar.lz nixpkgs-56127c23c2ce78f8ae31f6e935716e001dbfc16d.tar.xz nixpkgs-56127c23c2ce78f8ae31f6e935716e001dbfc16d.tar.zst nixpkgs-56127c23c2ce78f8ae31f6e935716e001dbfc16d.zip |
gargoyle: remove cf-private
-rw-r--r-- | pkgs/games/gargoyle/default.nix | 4 | ||||
-rw-r--r-- | 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 62ea798e465..83a567fa578 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 125c89971aa..6747577c294 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 { }; |