about summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authormarkuskowa <markus.kowalewski@gmail.com>2019-01-06 00:42:17 +0100
committerGitHub <noreply@github.com>2019-01-06 00:42:17 +0100
commitbdbf3f964f4e9c8b6e091759355e1516d3c0e483 (patch)
tree403b267fdf6ffb7aaeb5c80a9220484a2fca405a /pkgs/tools/system
parente7551acb7b70862561d7c3a6d9ad6408fc0cbfe7 (diff)
parent47250ec683cc7f28b717cadb906124d6e7bb35c2 (diff)
downloadnixlib-bdbf3f964f4e9c8b6e091759355e1516d3c0e483.tar
nixlib-bdbf3f964f4e9c8b6e091759355e1516d3c0e483.tar.gz
nixlib-bdbf3f964f4e9c8b6e091759355e1516d3c0e483.tar.bz2
nixlib-bdbf3f964f4e9c8b6e091759355e1516d3c0e483.tar.lz
nixlib-bdbf3f964f4e9c8b6e091759355e1516d3c0e483.tar.xz
nixlib-bdbf3f964f4e9c8b6e091759355e1516d3c0e483.tar.zst
nixlib-bdbf3f964f4e9c8b6e091759355e1516d3c0e483.zip
Merge pull request #53377 from marsam/update-bfs
bfs: 1.2.4 -> 1.3.1
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/bfs/default.nix16
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 3734fefe60a2..3e9210d5b350 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -1,23 +1,17 @@
-{ stdenv, fetchFromGitHub, bash }:
+{ stdenv, fetchFromGitHub, libcap, acl }:
 
 stdenv.mkDerivation rec {
   name = "bfs-${version}";
-  version = "1.2.4";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "0nxx2njjp04ik6msfmf07hprw0j88wg04m0q1sf17mhkliw2d78s";
+    sha256 = "0gv9hrcsz7miv40v6wmkmb1a58ji5d1dlgwq6gwczd8rzlmhddmc";
   };
 
-  postPatch = ''
-    # Patch tests (both shebangs and usage in scripts)
-    for f in $(find -type f -name '*.sh'); do
-      substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
-    done
-  '';
-  doCheck = true;
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
 
   makeFlags = [ "PREFIX=$(out)" ];
   buildFlags = [ "release" ]; # "release" enables compiler optimizations
@@ -30,7 +24,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/tavianator/bfs;
     license = licenses.bsd0;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ yesbox ];
   };
 }