Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 183e706767f1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8539d5f48f9d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 30, 2020

  1. argbash: fix build 

    * Fixed sourceRoot as it's not possible to write in a different
  store-path (`${src}` in this case).
* Patched shebangs to not use `/bin/bash`.
* Added `docutils` to nativeBuildInputs to fix build of the man-pages

See also https://hydra.nixos.org/build/110901127
    @Ma27
    Ma27 committed Jan 30, 2020
    Copy the full SHA
    8539d5f View commit details
Showing with 15 additions and 3 deletions.
  1. +15 −3 pkgs/development/tools/misc/argbash/default.nix
18 changes: 15 additions & 3 deletions pkgs/development/tools/misc/argbash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoconf }:
{ stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }:

stdenv.mkDerivation rec {
pname = "argbash";
@@ -12,12 +12,24 @@ stdenv.mkDerivation rec {
sha256 = "0zara7v3pnwiwkpb0x0g37pxhmim4425q4gba712f6djj115r1mr";
};

sourceRoot = "${src}/resources";
sourceRoot = "source/resources";

nativeBuildInputs = [ autoconf ];
postPatch = ''
chmod -R +w ..
patchShebangs ..
substituteInPlace Makefile \
--replace '/bin/bash' "${runtimeShell}"
'';

nativeBuildInputs = [ autoconf python3Packages.docutils makeWrapper ];

makeFlags = [ "PREFIX=$(out)" ];

postInstall = ''
wrapProgram $out/bin/argbash \
--prefix PATH : '${autoconf}/bin'
'';

meta = with stdenv.lib; {
description = "Bash argument parsing code generator";
homepage = "https://argbash.io/";