ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

gobject-introspection: Don't hardcode /nix/store

Browse Source 
If no config.nix.storeDir has been set, don't fall back to "/nix/store"
but use builtins.storeDir instead so we always should end up with the
correct store path no matter whether config.nix.storeDir has been set.

Thanks to @lethalman for pointing this out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2016-01-22 23:55:31 +01:00
parent c83e697aa0
commit 723f7f8f4f
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
, libintlOrEmpty, autoconf, automake, otool
, substituteAll, nixStoreDir ? "/nix/store"
, substituteAll, nixStoreDir ? builtins.storeDir
}:
# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
# it may be worth thinking about using multiple derivation outputs

2
pkgs/top-level/all-packages.nix
View File

@ -6640,7 +6640,7 @@ let
mpfr = callPackage ../development/libraries/mpfr/default.nix { };
gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
nixStoreDir = config.nix.storeDir or "/nix/store";
nixStoreDir = config.nix.storeDir or builtins.storeDir;
};
goocanvas = callPackage ../development/libraries/goocanvas { };