JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib: fix splitting outputs, comment on internal pcre

Browse Source 
glib-tested succeeds for me, assuming one reverts old splitting changes
in tzdata.
This commit is contained in:
Vladimír Čunát 2015-04-20 09:58:55 +02:00
parent 2b5e7bd2ba
commit 6b8a8ca59f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/glib/default.nix
View File

@ -53,20 +53,21 @@ stdenv.mkDerivation rec {
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
#outputs = [ "dev" "out" "bin" ]; # ToDo: no idea what's wrong! docs? outputs = [ "dev" "out" "doc" ];
outputBin = "dev";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
buildInputs = [ /*stdenv.hookLib.multiout*/ libelf ] buildInputs = [ libelf setupHook/*get the gtk-doc hook*/ ]
++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
nativeBuildInputs = [ pkgconfig gettext perl python ]; nativeBuildInputs = [ pkgconfig gettext perl python ];
propagatedBuildInputs = [ pcre zlib libffi libiconv ] propagatedBuildInputs = [ zlib libffi libiconv /*pcre*/ ]
++ libintlOrEmpty; ++ libintlOrEmpty;
configureFlags = configureFlags = [ ] # [ "--with-pcre=system" ] # internal pcre only adds <200kB
optional stdenv.isDarwin "--disable-compile-warnings" ++ optional stdenv.isDarwin "--disable-compile-warnings"
++ optional stdenv.isSunOS "--disable-modular-tests"; ++ optional stdenv.isSunOS "--disable-modular-tests";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
@ -80,6 +81,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
DETERMINISTIC_BUILD = 1; DETERMINISTIC_BUILD = 1;
postInstall = ''
_moveToOutput "share/glib-2.0" "$dev"
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
'';
inherit doCheck; inherit doCheck;
preCheck = optionalString doCheck preCheck = optionalString doCheck
'' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"