From 2cab2f6c426008a232deacb2c7c78c470f68b8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 21 Sep 2024 02:12:53 -0600 Subject: [PATCH 1/2] gle: format --- pkgs/development/libraries/gle/default.nix | 33 +++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index f9ef65197bd5..dbdc4d699233 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,8 +1,32 @@ -{lib, stdenv, fetchurl, libglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}: +{ + lib, + stdenv, + fetchurl, + libglut, + libX11, + libXt, + libXmu, + libXi, + libXext, + libGL, + libGLU, +}: + stdenv.mkDerivation rec { pname = "gle"; version = "3.1.0"; - buildInputs = [libGLU libGL libglut libX11 libXt libXmu libXi libXext]; + + buildInputs = [ + libGLU + libGL + libglut + libX11 + libXt + libXmu + libXi + libXext + ]; + src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" @@ -10,10 +34,11 @@ stdenv.mkDerivation rec { ]; sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; }; + meta = { description = "Tubing and extrusion library"; - license = lib.licenses.gpl2 ; - maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; } From 3c28377e51cf5af8fb9166443711e7305f2861bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 21 Sep 2024 02:06:41 -0600 Subject: [PATCH 2/2] =?UTF-8?q?gle:=203.1.0=20=E2=86=92=203.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gle/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index dbdc4d699233..b1b064fdb17c 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, libglut, libX11, libXt, @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gle"; - version = "3.1.0"; + version = "3.1.2"; buildInputs = [ libGLU @@ -27,12 +28,15 @@ stdenv.mkDerivation rec { libXext ]; - src = fetchurl { - urls = [ - "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz" - "https://www.linas.org/gle/pub/gle-${version}.tar.gz" - ]; - sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; + nativeBuildInputs = [ + autoreconfHook + ]; + + src = fetchFromGitHub { + owner = "linas"; + repo = "glextrusion"; + rev = "refs/tags/${pname}-${version}"; + sha256 = "sha256-yvCu0EOwxOMN6upeHX+C2sIz1YVjjB/320g+Mf24S6g="; }; meta = {