diff options
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/bfs/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/system/fakeroot/default.nix | 8 |
2 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 3734fefe60a22..3e9210d5b3507 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 ]; }; } diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 8796de4e9e070..1a16a8a34c7fa 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, getopt, libcap }: +{ stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: stdenv.mkDerivation rec { version = "1.23"; @@ -29,14 +29,12 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ getopt ] + buildInputs = [ getopt gnused ] ++ stdenv.lib.optional (!stdenv.isDarwin) libcap ; postUnpack = '' - for prog in getopt; do - sed -i "s@getopt@$(type -p getopt)@g" ${name}/scripts/fakeroot.in - done + sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in ''; meta = { |