Unverified Commit 77417e39 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

garden-of-coloured-lights: move to by-name, modernize, adopt (#450423)

parents 61e62a6e 42e7b546

pkgs/games/garden-of-coloured-lights/default.nix→pkgs/by-name/ga/garden-of-coloured-lights/package.nix

+12 −9
Original line number Diff line number Diff line
@@ -4,10 +4,14 @@ 
  fetchurl,

  autoconf,

  automake,

  allegro,

  allegro4,

}:



stdenv.mkDerivation rec {

let

  allegro = allegro4;

in



stdenv.mkDerivation (finalAttrs: {

  pname = "garden-of-coloured-lights";

  version = "1.0.9";
@@ -24,8 +28,8 @@ stdenv.mkDerivation rec { 
  '';



  src = fetchurl {

    url = "mirror://sourceforge/garden/${version}/garden-${version}.tar.gz";

    sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s";

    url = "mirror://sourceforge/garden/${finalAttrs.version}/garden-${finalAttrs.version}.tar.gz";

    hash = "sha256-2vhzLCKaTMBPRgUUv/G6BRcfqtqeGVdccqUKkU8jUuM=";

  };



  # Workaround build failure on -fno-common toolchains:
@@ -33,12 +37,11 @@ stdenv.mkDerivation rec { 
  #     `eclass'; eclass.o:src/eclass.c:21: first defined here

  env.NIX_CFLAGS_COMPILE = "-fcommon";



  meta = with lib; {

  meta = {

    description = "Old-school vertical shoot-em-up / bullet hell";

    mainProgram = "garden";

    homepage = "https://sourceforge.net/projects/garden/";

    maintainers = [ ];

    license = licenses.gpl3;

    maintainers = with lib.maintainers; [ iedame ];

    license = lib.licenses.gpl3;

  };



}
 
})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -13397,8 +13397,6 @@ with pkgs; 


  freeciv_gtk = freeciv;



  garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };



  gl-gsync-demo = callPackage ../games/gl-gsync-demo {

    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;

  };