From c758e553de4e425f754643f1c75f3d4042c255b3 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:40:12 +1000 Subject: [PATCH 1/5] guile-sdl2: code formatting nits --- .../guile-modules/guile-sdl2/default.nix | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 52dbd89232b..bbbd8fa8329 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,46 +1,43 @@ -{ stdenv, - SDL2, - SDL2_image, - SDL2_ttf, - SDL2_mixer, - autoconf, - automake, - fetchgit, - guile, - libtool, - pkgconfig - }: -stdenv.mkDerivation rec { - name = "guile-sdl2-${version}"; +{ stdenv, fetchgit, autoconf, automake, guile, libtool, pkgconfig +, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer +}: + +let + name = "${pname}-${version}"; + pname = "guile-sdl2"; version = "0.1.0"; - buildInputs = [ autoconf - automake - SDL2 - SDL2_image - SDL2_ttf - SDL2_mixer - libtool - guile - pkgconfig ]; +in stdenv.mkDerivation { + inherit name; + src = fetchgit { url = "git://dthompson.us/guile-sdl2.git"; rev = "048f80ddb5c6b03b87bba199a99a6f22d911bfff"; sha256 = "1v7bc2bsddb46qdzq7cyzlw5i2y175kh66mbzbjky85sjfypb084"; }; + + buildInputs = [ + autoconf automake guile libtool pkgconfig + SDL2 SDL2_image SDL2_ttf SDL2_mixer + ]; + preConfigurePhases = [ "bootstrapPhase" ]; - bootstrapPhase = '' - ./bootstrap - ''; - configureFlags = [ "--with-libsdl2-prefix=${SDL2}" - "--with-libsdl2-image-prefix=${SDL2_image}" - "--with-libsdl2-ttf-prefix=${SDL2_ttf}" - "--with-libsdl2-mixer-prefix=${SDL2_mixer}"]; - makeFlags = ["GUILE_AUTO_COMPILE=0"]; - meta = { + + bootstrapPhase = "./bootstrap"; + + configureFlags = [ + "--with-libsdl2-prefix=${SDL2}" + "--with-libsdl2-image-prefix=${SDL2_image}" + "--with-libsdl2-ttf-prefix=${SDL2_ttf}" + "--with-libsdl2-mixer-prefix=${SDL2_mixer}" + ]; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + meta = with stdenv.lib; { description = "Bindings to SDL2 for GNU Guile"; - homepage = https://git.dthompson.us/guile-sdl2.git; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.seppeljordan ]; - platforms = stdenv.lib.platforms.all; + homepage = "https://git.dthompson.us/guile-sdl2.git"; + license = licenses.gpl3; + maintainers = with maintainers; [ seppeljordan ]; + platforms = platforms.all; }; } From 2327fa6996cc1139fc3db0b26edefa652252f213 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:40:32 +1000 Subject: [PATCH 2/5] guile-sdl2: add vyp as maintainer --- pkgs/development/guile-modules/guile-sdl2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index bbbd8fa8329..d7d4658f7a7 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { description = "Bindings to SDL2 for GNU Guile"; homepage = "https://git.dthompson.us/guile-sdl2.git"; license = licenses.gpl3; - maintainers = with maintainers; [ seppeljordan ]; + maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; }; } From 1c818af667cc67f01acea09cb1b1a7bc1b8a7691 Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:41:12 +1000 Subject: [PATCH 3/5] guile-sdl2: use the proper homepage URL --- pkgs/development/guile-modules/guile-sdl2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index d7d4658f7a7..412440a4a22 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bindings to SDL2 for GNU Guile"; - homepage = "https://git.dthompson.us/guile-sdl2.git"; + homepage = "https://dthompson.us/projects/guile-sdl2.html"; license = licenses.gpl3; maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; From 47710757db8d768d883b09e9e20bccf3bc35857b Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:42:55 +1000 Subject: [PATCH 4/5] guile-sdl2: set the correct upstream license --- pkgs/development/guile-modules/guile-sdl2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 412440a4a22..5c741d5242d 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bindings to SDL2 for GNU Guile"; homepage = "https://dthompson.us/projects/guile-sdl2.html"; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; }; From 8543e31f66aff5359b0f5c8cd8807580ee2d177b Mon Sep 17 00:00:00 2001 From: xd1le Date: Thu, 28 Sep 2017 14:54:04 +1000 Subject: [PATCH 5/5] guile-sdl2: 0.1.0 -> 0.2.0 Autoconf, automake, and running `./bootstrap` is no longer required because we are now building from the tarball, which includes the generated ./configure script. --- .../guile-modules/guile-sdl2/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index 5c741d5242d..b20fc162ef3 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchgit, autoconf, automake, guile, libtool, pkgconfig +{ stdenv, fetchurl, guile, libtool, pkgconfig , SDL2, SDL2_image, SDL2_ttf, SDL2_mixer }: let name = "${pname}-${version}"; pname = "guile-sdl2"; - version = "0.1.0"; + version = "0.2.0"; in stdenv.mkDerivation { inherit name; - src = fetchgit { - url = "git://dthompson.us/guile-sdl2.git"; - rev = "048f80ddb5c6b03b87bba199a99a6f22d911bfff"; - sha256 = "1v7bc2bsddb46qdzq7cyzlw5i2y175kh66mbzbjky85sjfypb084"; + src = fetchurl { + url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; + sha256 = "0yq9lsl17cdvj77padvpk3jcw2g6g0pck9jrchc7n2767rrc012b"; }; buildInputs = [ - autoconf automake guile libtool pkgconfig + guile libtool pkgconfig SDL2 SDL2_image SDL2_ttf SDL2_mixer ]; - preConfigurePhases = [ "bootstrapPhase" ]; - - bootstrapPhase = "./bootstrap"; - configureFlags = [ "--with-libsdl2-prefix=${SDL2}" "--with-libsdl2-image-prefix=${SDL2_image}"