diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/coin3d | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/coin3d')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/coin3d/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 7fd676372534..c76aaa4c8e53 100644 --- a/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -1,14 +1,15 @@ -{ fetchFromGitHub, stdenv, boost, cmake, libGL, libGLU }: +{ fetchFromGitHub, stdenv, boost, cmake, libX11, libGL, libGLU }: stdenv.mkDerivation rec { pname = "coin"; - version = "4.0.0"; + version = "2020-12-07-unstable"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; - rev = "Coin-${version}"; - sha256 = "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p"; + # rev = "Coin-${version}"; + rev = "d5539998aff272b349590fe74d068659682ecd0d"; + sha256 = "11jaz8p9nn8jpd6dsgwgkldwr7z829gyf64g014qyyh8l6p7jzzd"; }; postPatch = '' @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libGL libGLU ]; + buildInputs = [ boost libX11 libGL libGLU ]; meta = with stdenv.lib; { homepage = "https://github.com/coin3d/coin"; |