diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-20 19:56:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 14:40:49 +0000 |
| commit | 36bedbe5c162bab9e7ef702f353ae399fdfd0518 (patch) | |
| tree | fb2926eee09fe0714683074758276739e9e5cda9 /nixpkgs/pkgs/development/libraries/gthree | |
| parent | 47852a9ef0e62a2d565f9ec0fba2a3ae77c44221 (diff) | |
| parent | 262b328b0bad0c4b97ed495679208e4a2eb87704 (diff) | |
| download | nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.gz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.bz2 nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.lz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.xz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.zst nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.zip | |
Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gthree')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gthree/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gthree/default.nix b/nixpkgs/pkgs/development/libraries/gthree/default.nix index 1af62e14d8d2..04d7c8d8f4d4 100644 --- a/nixpkgs/pkgs/development/libraries/gthree/default.nix +++ b/nixpkgs/pkgs/development/libraries/gthree/default.nix @@ -15,28 +15,19 @@ , json-glib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gthree"; - version = "unstable-2019-08-21"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "alexlarsson"; repo = "gthree"; - rev = "dac46b0f35e29319c004c7e17b5f345ef4c04cb8"; - sha256 = "16ixis2g04000zffm44s7ir64vn3byz9a793g2s76aasqybl86i2"; + rev = version; + sha256 = "16ap1ampnzsyhrs84b168d6889lh8sjr2j5sqv9mdbnnhy72p5cd"; }; - patches = [ - # correctly declare json-glib in .pc file - # https://github.com/alexlarsson/gthree/pull/61 - (fetchpatch { - url = https://github.com/alexlarsson/gthree/commit/784b1f20e0b6eb15f113a51f74c2cba871249861.patch; - sha256 = "07vxafaxris5a98w751aw04nlw0l45np1lba08xd16wdzmkadz0x"; - }) - ]; - nativeBuildInputs = [ ninja meson @@ -64,7 +55,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GObject/GTK port of three.js"; - homepage = https://github.com/alexlarsson/gthree; + homepage = "https://github.com/alexlarsson/gthree"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; |