diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/draco | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/draco')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/draco/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/draco/tinygltf.nix | 30 |
2 files changed, 33 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/draco/default.nix b/nixpkgs/pkgs/development/libraries/draco/default.nix index 4b02b11b3d23..1cc8a843dcd5 100644 --- a/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -15,14 +15,14 @@ let cmakeBool = b: if b then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.5.6"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI="; fetchSubmodules = true; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jansol ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix b/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix new file mode 100644 index 000000000000..4f965c653850 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, cmake +}: + +stdenv.mkDerivation rec { + version = "2.8.7"; + pname = "tinygltf"; + + src = fetchFromGitHub { + owner = "syoyo"; + repo = "tinygltf"; + rev = "v${version}"; + hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4="; + }; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Header only C++11 tiny glTF 2.0 library"; + homepage = "https://github.com/syoyo/tinygltf"; + license = licenses.mit; + maintainers = with maintainers; [ jansol ]; + platforms = platforms.all; + }; +} |