tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
treewide: Fix output references to glib
Tuomas Tynkkynen
9 years ago
d801e8a0
fffd8f19
+3
-3
2 changed files
expand all
collapse all
unified
split
pkgs
applications
office
gnucash
default.nix
desktops
gnome-3
3.20
core
gnome-keyring
default.nix
+1
-1
pkgs/applications/office/gnucash/default.nix
···
52
52
'';
53
53
54
54
# The following settings fix failures in the test suite. It's not required otherwise.
55
55
-
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib";
55
55
+
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
56
56
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
57
57
58
58
doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084
+2
-2
pkgs/desktops/gnome-3/3.20/core/gnome-keyring/default.nix
···
21
21
22
22
preFixup = ''
23
23
wrapProgram "$out/bin/gnome-keyring" \
24
24
-
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
24
24
+
--prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
25
25
wrapProgram "$out/bin/gnome-keyring-daemon" \
26
26
-
--prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
26
26
+
--prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
27
27
'';
28
28
29
29
meta = with stdenv.lib; {