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

treewide: Fix output references to glib

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-23 04:34:13 +03:00
parent fffd8f192e
commit d801e8a011
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/office/gnucash/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
''; '';
# The following settings fix failures in the test suite. It's not required otherwise. # The following settings fix failures in the test suite. It's not required otherwise.
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib"; NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084 doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084

4
pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
View File

@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$out/bin/gnome-keyring" \ wrapProgram "$out/bin/gnome-keyring" \
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/bin/gnome-keyring-daemon" \ wrapProgram "$out/bin/gnome-keyring-daemon" \
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {