diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-04 23:20:27 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-04 23:20:43 +0100 |
| commit | ea7b252c9ae0117b8f150950d730a7445d3f5e2d (patch) | |
| tree | 232a59d460e1f5d46a6f92f2fd3de08741dc8904 /pkgs/development/libraries | |
| parent | a3018650a3dab79a34ed24abae008ed2a3b0392e (diff) | |
| parent | 000fb9be33528f867e2355ddedde0836ba7f7a3a (diff) | |
| download | nixpkgs-ea7b252c9ae0117b8f150950d730a7445d3f5e2d.tar nixpkgs-ea7b252c9ae0117b8f150950d730a7445d3f5e2d.tar.gz nixpkgs-ea7b252c9ae0117b8f150950d730a7445d3f5e2d.tar.bz2 nixpkgs-ea7b252c9ae0117b8f150950d730a7445d3f5e2d.tar.lz nixpkgs-ea7b252c9ae0117b8f150950d730a7445d3f5e2d.tar.xz nixpkgs-ea7b252c9ae0117b8f150950d730a7445d3f5e2d.tar.zst nixpkgs-ea7b252c9ae0117b8f150950d730a7445d3f5e2d.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libbrotli/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/libvncserver/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/vulkan-loader/default.nix | 3 |
3 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix index 1e28b57dadf..03604e3a93e 100644 --- a/pkgs/development/libraries/libbrotli/default.nix +++ b/pkgs/development/libraries/libbrotli/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable}: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }: stdenv.mkDerivation rec { - name = "libbrotli-20160120"; - version = "53d53e8"; + name = "libbrotli-${version}"; + version = "1.0"; src = fetchFromGitHub { owner = "bagder"; repo = "libbrotli"; - rev = "53d53e8d9c0d37398d37bac2e7a7aa20b0025e9e"; - sha256 = "10r4nx6n1r54f5cjck5mmmsj7bkasnmmz7m84imhil45q73kzd4m"; + rev = name; + sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y"; }; - buildInputs = [autoconf automake libtool]; + nativeBuildInputs = [ autoconf automake libtool ]; + preConfigure = '' cp -r ${brotliUnstable.src}/* brotli/ chmod -R +700 brotli diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 581673af64d..93f62376ac6 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, - libXrandr, randrproto, libXtst, zlib + libXrandr, randrproto, libXtst, zlib, libgcrypt }: assert stdenv.isLinux; @@ -19,7 +19,7 @@ let buildInputs = [ libtool libjpeg openssl libX11 libXdamage xproto damageproto xextproto libXext fixesproto libXfixes xineramaproto libXinerama - libXrandr randrproto libXtst zlib + libXrandr randrproto libXtst zlib libgcrypt ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 622d027c60b..731bd81cb6f 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -63,7 +63,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = http://www.lunarg.com; + homepage = "http://www.lunarg.com"; platforms = platforms.linux; + license = licenses.asl20; }; } |