Unverified Commit eb5261c4 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #233765 from NickCao/xfsprogs 

xfsprogs: removed unneeded make configure invocation and build inputs
parents d048d75e 38c9e233

pkgs/tools/filesystems/xfsprogs/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, gettext, libtool, pkg-config

{ lib, stdenv, buildPackages, fetchurl, gettext, pkg-config

, icu, libuuid, readline, inih, liburcu

, nixosTests

}:
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec { 


  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [

    autoconf automake libtool gettext pkg-config

    gettext pkg-config

    libuuid # codegen tool uses libuuid

    liburcu # required by crc32selftest

  ];

  buildInputs = [ readline icu inih liburcu ];

  propagatedBuildInputs = [ libuuid ]; # Dev headers include <uuid/uuid.h>
@@ -33,7 +34,6 @@ stdenv.mkDerivation rec { 
      substituteInPlace "$file" \

        --replace '@sbindir@' '/run/current-system/sw/bin'

    done

    make configure

    patchShebangs ./install-sh

  '';