From f61b91cec4654ce730141c1f58a9ec521ab70888 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 Nov 2020 00:24:57 -0300 Subject: [PATCH 1/2] antiprism: init at 0.26 --- .../science/geometry/antiprism/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/science/geometry/antiprism/default.nix diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix new file mode 100644 index 000000000000..4691291a4257 --- /dev/null +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, libX11 +, libGL +, libGLU +, freeglut }: + +stdenv.mkDerivation rec { + pname = "antiprism"; + version = "0.26"; + + src = fetchFromGitHub { + owner = "antiprism"; + repo = pname; + rev = version; + sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; + + meta = with stdenv.lib; { + homepage = "https://www.antiprism.com"; + description = "A collection of programs for generating, manipulating, transforming and viewing polyhedra"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74b21e526bae..b30e42e100d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1163,6 +1163,8 @@ in gaia = callPackage ../development/libraries/gaia { }; + antiprism = callPackage ../applications/science/geometry/antiprism { }; + gama = callPackage ../applications/science/geometry/gama { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; From fb1c3a2e1d9af4419af34651e8e0a300b4e69479 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 Nov 2020 00:48:32 -0300 Subject: [PATCH 2/2] all-packages.nix: a small reorganization Now the science/geometry expressions are in a same block of the all-packages file. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b30e42e100d8..017ac9c7a13e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1163,10 +1163,6 @@ in gaia = callPackage ../development/libraries/gaia { }; - antiprism = callPackage ../applications/science/geometry/antiprism { }; - - gama = callPackage ../applications/science/geometry/gama { }; - gamecube-tools = callPackage ../development/tools/gamecube-tools { }; gammy = qt5.callPackage ../tools/misc/gammy { }; @@ -26163,6 +26159,10 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { ### SCIENCE/GEOMETRY + antiprism = callPackage ../applications/science/geometry/antiprism { }; + + gama = callPackage ../applications/science/geometry/gama { }; + drgeo = callPackage ../applications/science/geometry/drgeo { inherit (gnome2) libglade; guile = guile_1_8;