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: 059c61d001fd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b38dd07eaa22
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 4, 2018

  1. nsjail: fix path to new{u|g}idmap (#51523)

    @c0bw3b
    c0bw3b authored Dec 4, 2018
    Copy the full SHA
    b38dd07 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/tools/security/nsjail/default.nix
9 changes: 8 additions & 1 deletion pkgs/tools/security/nsjail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which
, libnl, protobuf, protobufc }:
, libnl, protobuf, protobufc, shadow
}:

stdenv.mkDerivation rec {
name = "nsjail-${version}";
@@ -13,6 +14,12 @@ stdenv.mkDerivation rec {
sha256 = "0cgycj0cz74plmz4asxryqprg6mkzpmnxzqbfsp1wwackinxq5fq";
};

postPatch = ''
substituteInPlace user.cc \
--replace "/usr/bin/newgidmap" "${shadow}/bin/newgidmap" \
--replace "/usr/bin/newuidmap" "${shadow}/bin/newuidmap"
'';

nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ];
buildInputs = [ libnl protobuf protobufc ];
enableParallelBuilding = true;