cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #146825 from S-NA/updates/nilfs-utils

Browse source 
nilfs-utils: fix hardcoded paths
This commit is contained in:
Artturi 2021-11-21 04:36:14 +02:00 committed by GitHub
commit 5e785a95fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/filesystems/nilfs-utils/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libuuid, libselinux }: { lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libuuid, libselinux
, e2fsprogs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nilfs-utils"; pname = "nilfs-utils";
@ -15,6 +16,12 @@ stdenv.mkDerivation rec {
buildInputs = [ libuuid libselinux ]; buildInputs = [ libuuid libselinux ];
postPatch = ''
# Fix up hardcoded paths.
substituteInPlace lib/cleaner_exec.c --replace /sbin/ $out/bin/
substituteInPlace sbin/mkfs/mkfs.c --replace /sbin/ ${lib.getBin e2fsprogs}/bin/
'';
# According to upstream, libmount should be detected automatically but the # According to upstream, libmount should be detected automatically but the
# build system fails to do this. This is likely a bug with their build system # build system fails to do this. This is likely a bug with their build system
# hence it is explicitly enabled here. # hence it is explicitly enabled here.