public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next-21.05' into staging-21.05

Browse Source
This commit is contained in:
Jonathan Ringer
2021-06-08 12:21:49 -07:00
parent 403fb2db47 a76d51dc52
commit 8e20586f52
85 changed files with 1142 additions and 1633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/box2d/default.nix
+3 -3
View File
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
version = "2.3.1";
src = fetchurl {
url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz";
sha256 = "0llpcifl8zbjbpxdwz87drd01m3lwnv82xb4av6kca1xn4w2gmkm";
url = "https://github.com/erincatto/box2d/archive/v${version}.tar.gz";
sha256 = "0p03ngsmyz0r5kbpiaq10ns4fxwkjvvawi8k6pfall46b93wizsq";
};
sourceRoot = "Box2D-${version}/Box2D";
sourceRoot = "box2d-${version}/Box2D";
nativeBuildInputs = [ cmake unzip pkg-config ];
buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ];
pkgs/development/libraries/sundials/default.nix
+2 -2
View File
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "examples" ];
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
sha256 = "jW3QlP7Mu41uzEE0DsFqZfq6yC7UQVAj9tfBwjkOovM=";
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM=";
};
nativeBuildInputs = [ cmake ];