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

Commits on Sep 13, 2017

  1. socklog: properly disable the chkshsgr test 

    My previous attempt d438cbb was
bogus ...
    @joachifm
    joachifm committed Sep 13, 2017
    Copy the full SHA
    705f47f View commit details

  2. socklog: fixup implicit function declarations

    @joachifm
    joachifm committed Sep 13, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aff74b6 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/tools/system/socklog/default.nix
12 changes: 7 additions & 5 deletions pkgs/tools/system/socklog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" ];

postPatch = ''
sed -i src/TARGETS -e '/^chkshsgr/d'
# Fails to run as user without supplementary groups
echo "int main() { return 0; }" >src/chkshsgr.c
# Fixup implicit function declarations
sed -i src/pathexec_run.c -e '1i#include <unistd.h>'
sed -i src/prot.c -e '1i#include <unistd.h>' -e '2i#include <grp.h>'
sed -i src/seek_set.c -e '1i#include <unistd.h>'
'';

configurePhase = ''
@@ -27,8 +33,6 @@ stdenv.mkDerivation rec {
buildPhase = ''package/compile'';

installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv command"/"* $out/bin
@@ -39,8 +43,6 @@ stdenv.mkDerivation rec {
mkdir -p $doc/share/doc/socklog/html
mv doc/*.html $doc/share/doc/socklog/html/
runHook postInstall
'';

checkPhase = ''package/check'';