Unverified Commit 38791474 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

svnfs: move NIX_LDFLAGS into env for structuredAttrs

parent 95fa78dc

pkgs/by-name/sv/svnfs/package.nix

+14 −6
Original line number Diff line number Diff line
@@ -41,12 +41,20 @@ stdenv.mkDerivation (finalAttrs: { 
    export LD_LIBRARY_PATH=${subversion.out}/lib

  '';



  env = {

    # -fcommon: workaround build failure on -fno-common toolchains like upstream

    # gcc-10. Otherwise build fails as:

    #   ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of

    #     `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here

  env.NIX_CFLAGS_COMPILE = "-I ${subversion.dev}/include/subversion-1 -fcommon";

  NIX_LDFLAGS = "-lsvn_client-1 -lsvn_subr-1";

    NIX_CFLAGS_COMPILE = toString [

      "-I ${subversion.dev}/include/subversion-1"

      "-fcommon"

    ];

    NIX_LDFLAGS = toString [

      "-lsvn_client-1"

      "-lsvn_subr-1"

    ];

  };



  meta = {

    description = "FUSE filesystem for accessing Subversion repositories";