diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-16 00:52:15 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-16 00:52:15 +0200 |
| commit | 2bd8fc9378a01ecf28d119fd86737d9c368bc620 (patch) | |
| tree | 6fdeb5f753ae9a7c0fcb12162f06660987320bad /pkgs/tools | |
| parent | 9ada55cec55cd7a1db6ac7a3bb93140961cfeac0 (diff) | |
| parent | d75710d82015b8ec2b11ba13fe23f9568ef76eb7 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/mtools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/gti/default.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 949b8c92f8468..e7345c639fe28 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "mtools"; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { # fails to find X on darwin configureFlags = lib.optional stdenv.isDarwin "--without-x"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + doCheck = true; meta = with lib; { diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index e950d58fc76ee..21089caf0236d 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gti"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; rev = "v${version}"; - sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9"; + sha256 = "sha256-x6ncvnZPPrVcQYwtwkSenW+ri0L6FpuDa7U7uYUqiyk="; }; postPatch = '' |