diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-01 12:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 12:01:10 +0000 |
| commit | 4a533d29ce8fa4759d9aa43e9cd0a128f0e94767 (patch) | |
| tree | fc99f88643464ac109c3fbe15fdc529f76da8a16 /pkgs/tools/filesystems | |
| parent | 39efd75b563a62d554b229624c78a646d014923a (diff) | |
| parent | 05e8361387301551045b988e30c4c926e804b739 (diff) | |
| download | nixlib-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar nixlib-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.gz nixlib-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.bz2 nixlib-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.lz nixlib-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.xz nixlib-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.tar.zst nixlib-4a533d29ce8fa4759d9aa43e9cd0a128f0e94767.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/9pfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/duperemove/default.nix | 25 |
2 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index abb8f695ebcc..7b652bd68aa0 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ywWG/H2ilt36mjlDSgIzYpardCFXpmbLiml6wy47XuA="; }; + postPatch = '' + substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG" + ''; + makeFlags = [ "BIN=$(out)/bin" "MAN=$(out)/share/man/man1" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index f32d026ac1cf..b13f216b8dbf 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, libgcrypt -, pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite -, util-linux, testers, duperemove }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch2 +, libgcrypt +, pkg-config +, glib +, linuxHeaders ? stdenv.cc.libc.linuxHeaders +, sqlite +, util-linux +, testers +, duperemove +}: stdenv.mkDerivation rec { pname = "duperemove"; @@ -13,6 +23,15 @@ stdenv.mkDerivation rec { hash = "sha256-D3+p8XgokKIHEwZnvOkn7cionVH1gsypcURF+PBpugY="; }; + patches = [ + # Use variable instead of hardcoding pkg-config + # https://github.com/markfasheh/duperemove/pull/315 + (fetchpatch2 { + url = "https://github.com/markfasheh/duperemove/commit/0e1c62d79a9a79d7bb3e80f1bd528dbf7cb75e22.patch"; + hash = "sha256-YMMu6LCkBlipEJALukQMwIMcjQEAG5pjGEGeTW9OEJk="; + }) + ]; + postPatch = '' substituteInPlace util.c --replace \ "lscpu" "${lib.getBin util-linux}/bin/lscpu" |