diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix index d2a98c4a8476..6d24ba7f2ed2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format @@ -27,13 +27,17 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.0.3"; + version = "1.1.0"; - src = fetchurl { - url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; - sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; + src = fetchFromGitHub { + owner = "webmproject"; + repo = pname; + rev = version; + sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm"; }; + prePatch = "patchShebangs ."; + configureFlags = [ (mkFlag threadingSupport "threading") (mkFlag openglSupport "gl") @@ -50,6 +54,7 @@ stdenv.mkDerivation rec { (mkFlag libwebpdecoderSupport "libwebpdecoder") ]; + nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] ++ optionals openglSupport [ freeglut libGL libGLU ] ++ optional pngSupport libpng |