diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-25 00:17:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 00:17:22 +0000 |
| commit | eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c (patch) | |
| tree | 358e7ecf71ec3060da94211bcada5196744f0cb5 /pkgs/tools/archivers | |
| parent | 8e2d0e45c0ec8f752dd29c20dafec37dfe420437 (diff) | |
| parent | d9a1de3d608ef92141a4d45e39fb7257b39f637d (diff) | |
| download | nixpkgs-eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c.tar nixpkgs-eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c.tar.gz nixpkgs-eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c.tar.bz2 nixpkgs-eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c.tar.lz nixpkgs-eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c.tar.xz nixpkgs-eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c.tar.zst nixpkgs-eb499aa20e5fd100e24b4cb1d81f9ec3b0be979c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/rpm2targz/default.nix | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/tools/archivers/rpm2targz/default.nix index ac5b132d7ab..1c4730c8de6 100644 --- a/pkgs/tools/archivers/rpm2targz/default.nix +++ b/pkgs/tools/archivers/rpm2targz/default.nix @@ -10,18 +10,7 @@ , zstd }: -let - shdeps = [ - bzip2 - coreutils - cpio - gnutar - gzip - xz - zstd - ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "rpm2targz"; version = "2021.03.16"; @@ -31,9 +20,17 @@ in stdenv.mkDerivation rec { hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ="; }; - buildInputs = shdeps; - - postPatch = '' + postPatch = let + shdeps = [ + bzip2 + coreutils + cpio + gnutar + gzip + xz + zstd + ]; + in '' substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\"" # rpm2targz relies on the executable name # to guess what compressor it should use @@ -41,9 +38,7 @@ in stdenv.mkDerivation rec { sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz ''; - preBuild = '' - makeFlagsArray+=(prefix=$out) - ''; + installFlags = [ "prefix=$(out)" ]; meta = with lib; { description = "Convert a .rpm file to a .tar.gz archive"; |