Unverified Commit 4847e4d4 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

rsyslog*: move NIX_CFLAGS_LINK into env, use finalAttrs (#495161)

parents 7e975cac 3c912b7e

pkgs/tools/system/rsyslog/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ 
  nixosTests,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "rsyslog";

  version = "8.2512.0";



  src = fetchurl {

    url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";

    url = "https://www.rsyslog.com/files/download/rsyslog/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";

    hash = "sha256-k8UAJdkLbHlfo1DVaj2DK/zkUEPqm9aCQNnCqTlLxik=";

  };
@@ -180,7 +180,7 @@ stdenv.mkDerivation rec { 
    (lib.enableFeature true "generate-man-pages")

  ];



  NIX_CFLAGS_LINK = "-lz";

  env.NIX_CFLAGS_LINK = "-lz";



  passthru.tests = {

    nixos-rsyslogd = nixosTests.rsyslogd;
@@ -190,9 +190,9 @@ stdenv.mkDerivation rec { 
    homepage = "https://www.rsyslog.com/";

    description = "Enhanced syslog implementation";

    mainProgram = "rsyslogd";

    changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${version}/ChangeLog";

    changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${finalAttrs.version}/ChangeLog";

    license = lib.licenses.gpl3Only;

    platforms = lib.platforms.linux;

    maintainers = [ ];

  };

}
 
})