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
base: 3947b88389d8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 69dcb1a2c0c5
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 29, 2018

  1. bundlerApp: take buildInputs (#45435)

    It would be reasonable to have a Ruby program that depends on some other
    program being in the PATH. In this case, the obvious thing to do would
    be something like this:
    
        bundlerApp {
          # ...
          buildInputs = [ makeWrapper ];
          postBuild = ''
            wrapProgram "$out/bin/foo" \
              --prefix PATH : ${lib.makeBinPath [ dep ]}
          '';
        }
    
    However, this doesn't work, because even though it just forwards most of
    its arguments to `runCommand`, `bundlerApp` won't take a `buildInputs`
    parameter. It doesn't even specify its own `buildInputs`, which means
    that the `scripts` parameter to `bundlerApp` (which depends on
    `makeWrapper`) is completely broken, and, as far as I can tell, has been
    since its inception. I've added a `makeWrapper` build input if the
    scripts parameter is present to fix this.
    
    I've added a `buildInputs` option to `bundlerApp`. It's also passed
    through to bundled-common because `postBuild` scripts are run there as
    well. This actually means that in this example we'd end up going through
    two layers of wrappers (one from `bundlerApp` and one from
    bundled-common), but that has always been the case and isn't likely to
    break anything. That oddity does suggest that it might be prudent to
    not forward `postBuild` to bundled-common (or to at least use a
    different option) though...
    
    FWIW, as far as I can tell no package in nixpkgs uses either the
    `scripts` or `postBuild` options to `bundlerApp`.
    alyssais authored and zimbatm committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    69dcb1a View commit details
    Browse the repository at this point in the history