mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
gargoyle: remove cf-private
This commit is contained in:
parent
bbf5f7e3da
commit
56127c23c2
pkgs
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig
|
{ 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
|
let
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||||
nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
|
nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
|
||||||
|
|
||||||
buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
|
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";
|
buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
|
||||||
|
|
||||||
|
|
|
@ -21541,7 +21541,7 @@ in
|
||||||
garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
|
garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
|
||||||
|
|
||||||
gargoyle = callPackage ../games/gargoyle {
|
gargoyle = callPackage ../games/gargoyle {
|
||||||
inherit (darwin) cctools cf-private;
|
inherit (darwin) cctools;
|
||||||
};
|
};
|
||||||
|
|
||||||
gav = callPackage ../games/gav { };
|
gav = callPackage ../games/gav { };
|
||||||
|
|
Loading…
Reference in a new issue