git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117348 from zseri/unbuild
commitd68bffb20061b6ff66396cff7c6bcb3d3c2bf328 authorSandro <sandro.jaeckel@gmail.com> dateWed 24 Mar 2021, 19:47 (6 years ago) parenteae2d17dcba35f
4 files changed+19−28
pkgs/tools/archivers/rpm2targz/default.nix+13−18 pkgs/tools/networking/zs-apc-spdu-ctl/default.nix+2−2 pkgs/tools/networking/zs-wait4host/default.nix+1−3 pkgs/tools/text/zstxtns-utils/default.nix+3−5
pkgs/tools/archivers/rpm2targz/default.nix+13−18
@@ -10,18 +10,7 @@
1010, zstd
1111}:
1212
13−let
14− shdeps = [
15− bzip2
16− coreutils
17− cpio
18− gnutar
19− gzip
20− xz
21− zstd
22− ];
23−
24−in stdenv.mkDerivation rec {
13+stdenv.mkDerivation rec {
2514 pname = "rpm2targz";
2615 version = "2021.03.16";
2716
@@ -31,9 +20,17 @@ in stdenv.mkDerivation rec {
3120 hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ=";
3221 };
3322
34− buildInputs = shdeps;
35−
36− postPatch = ''
23+ postPatch = let
24+ shdeps = [
25+ bzip2
26+ coreutils
27+ cpio
28+ gnutar
29+ gzip
30+ xz
31+ zstd
32+ ];
33+ in ''
3734 substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\""
3835 # rpm2targz relies on the executable name
3936 # to guess what compressor it should use
@@ -41,9 +38,7 @@ in stdenv.mkDerivation rec {
4138 sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz
4239 '';
4340
44− preBuild = ''
45− makeFlagsArray+=(prefix=$out)
46− '';
41+ installFlags = [ "prefix=$(out)" ];
4742
4843 meta = with lib; {
4944 description = "Convert a .rpm file to a .tar.gz archive";
pkgs/tools/networking/zs-apc-spdu-ctl/default.nix+2−2
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
2020 };
2121
2222 nativeBuildInputs = [ cmake ];
23− buildInputs = [ fping libowlevelzs net-snmp ];
23+ buildInputs = [ libowlevelzs net-snmp ];
2424
2525 postPatch = ''
2626 substituteInPlace src/confent.cxx \
27− --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping"
27+ --replace /usr/sbin/fping "${fping}/bin/fping"
2828 '';
2929
3030 meta = with lib; {
pkgs/tools/networking/zs-wait4host/default.nix+1−3
@@ -1,4 +1,4 @@
1−{ bash, coreutils, fetchurl, fping, lib, stdenvNoCC }:
1+{ coreutils, fetchurl, fping, lib, stdenvNoCC }:
22
33stdenvNoCC.mkDerivation rec {
44 pname = "zs-wait4host";
@@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec {
99 sha256 = "9F1264BDoGlRR7bWlRXhfyvxWio4ydShKmabUQEIz9I=";
1010 };
1111
12− buildInputs = [ bash coreutils fping ];
13−
1412 postPatch = ''
1513 for i in zs-wait4host zs-wait4host-inf; do
1614 substituteInPlace "$i" \
pkgs/tools/text/zstxtns-utils/default.nix+3−5
@@ -1,5 +1,4 @@
1−{ bash
2−, coreutils
1+{ coreutils
32, fetchurl
43, gnugrep
54, lib
@@ -18,7 +17,6 @@ stdenvNoCC.mkDerivation rec {
1817 };
1918
2019 nativeBuildInputs = [ makeWrapper ];
21− buildInputs = [ bash coreutils gnugrep moreutils ];
2220
2321 installPhase = ''
2422 runHook preInstall
@@ -27,8 +25,8 @@ stdenvNoCC.mkDerivation rec {
2725 '';
2826
2927 postInstall = ''
30− wrapProgram $out/bin/zstxtns-merge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep moreutils]}"
31− wrapProgram $out/bin/zstxtns-unmerge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep]}"
28+ wrapProgram $out/bin/zstxtns-merge --set PATH "${lib.makeBinPath [coreutils gnugrep moreutils]}"
29+ wrapProgram $out/bin/zstxtns-unmerge --set PATH "${lib.makeBinPath [coreutils gnugrep]}"
3230 '';
3331
3432 meta = with lib; {