diff options
author | adisbladis <adisbladis@gmail.com> | 2019-11-07 16:34:34 +0000 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-11-09 10:34:50 +0000 |
commit | 1733a6f94156b849a8b8b567607cd693615ff6b1 (patch) | |
tree | 2eddb39b1c0ce080d0ba5c217e75b1e357628727 | |
parent | 52997f11caeccccadf896ca57077d0f3a96483bd (diff) | |
download | nixpkgs-1733a6f94156b849a8b8b567607cd693615ff6b1.tar nixpkgs-1733a6f94156b849a8b8b567607cd693615ff6b1.tar.gz nixpkgs-1733a6f94156b849a8b8b567607cd693615ff6b1.tar.bz2 nixpkgs-1733a6f94156b849a8b8b567607cd693615ff6b1.tar.lz nixpkgs-1733a6f94156b849a8b8b567607cd693615ff6b1.tar.xz nixpkgs-1733a6f94156b849a8b8b567607cd693615ff6b1.tar.zst nixpkgs-1733a6f94156b849a8b8b567607cd693615ff6b1.zip |
mesa: 19.2.1 -> 19.2.3
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa/stubs.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index caeb8dba8a6..1e7a716fcea 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.2.1"; + version = "19.2.3"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9"; + sha256 = "0ish3izys9rr8rpr8h56a0jmnrvacn16k8pblv4xqhgy0hjy9rjy"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix index 5cb6ac3d4d1..a53f2dc28e7 100644 --- a/pkgs/development/libraries/mesa/stubs.nix +++ b/pkgs/development/libraries/mesa/stubs.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ln -s ${libglvnd.out}/lib $out/lib mkdir -p $dev/{,lib/pkgconfig,nix-support} - echo "$out" > $dev/nix-support/propagated-build-inputs + echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs ln -s ${mesa.dev}/include $dev/include genPkgConfig() { @@ -63,7 +63,7 @@ stdenv.mkDerivation { Description: $lib library Version: ${mesa.version} Libs: -L${libglvnd.out}/lib -l$lib - Cflags: -I${mesa.dev}/include + Cflags: -I${mesa.dev}/include -I${libglvnd.dev}/include EOF } |