diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:07:33 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:07:33 +0200 |
commit | 98ef78326d4349a14e328b322495e34242d796cc (patch) | |
tree | 1582a9a7d560d91b7125a4b5a4c49dab62a0479d /pkgs/tools | |
parent | 92b96ce63fa8752d0487edbe026a37ff765b33b3 (diff) | |
parent | 96e5474329a3c2b2309872fb01b007daaf6d7bdc (diff) | |
download | nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.gz nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.bz2 nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.lz nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.xz nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.zst nixlib-98ef78326d4349a14e328b322495e34242d796cc.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/vulkan-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/patchutils/generic.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 75b5722b141a..9ea1c2d73438 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8"; + sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 87d925e333f6..9d7ac4b53f05 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, perl , version, sha256, patches ? [] , ... }: @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { inherit sha256; }; + buildInputs = [ perl ]; hardeningDisable = [ "format" ]; doCheck = false; # fails |