pstoedit: fix build on darwin, tidy (#405719)

authored by Aleksana and committed by GitHub 69410064 cd1604c4

+5 -6
+5 -6
pkgs/by-name/ps/pstoedit/package.nix
··· 23 hash = "sha256-VYi0MtLGsq2YKLRJFepYE/+aOjMSpB+g3kw43ayd9y8="; 24 }; 25 26 outputs = [ 27 "out" 28 "dev" ··· 44 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 45 libiconv 46 ]; 47 - 48 - # '@LIBPNG_LDFLAGS@' is no longer substituted by autoconf (the code is commented out) 49 - # so we need to remove it from the pkg-config file as well 50 - preConfigure = '' 51 - substituteInPlace config/pstoedit.pc.in --replace '@LIBPNG_LDFLAGS@' "" 52 - ''; 53 54 postInstall = '' 55 wrapProgram $out/bin/pstoedit \
··· 23 hash = "sha256-VYi0MtLGsq2YKLRJFepYE/+aOjMSpB+g3kw43ayd9y8="; 24 }; 25 26 + postPatch = '' 27 + # don't use gnu-isms like link.h on macos 28 + substituteInPlace src/pstoedit.cpp --replace-fail '#ifndef _MSC_VER' '#if !defined(_MSC_VER) && !defined(__APPLE__)' 29 + ''; 30 + 31 outputs = [ 32 "out" 33 "dev" ··· 49 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 50 libiconv 51 ]; 52 53 postInstall = '' 54 wrapProgram $out/bin/pstoedit \