summary refs log tree commit diff
path: root/pkgs/development/libraries/gobject-introspection/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-01-22 23:55:31 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-01-22 23:55:31 +0100
commit723f7f8f4fc44f0621227e1feaf61901fca12db9 (patch)
treee16edf7a065dfd174aed456e52429cef0b25055e /pkgs/development/libraries/gobject-introspection/default.nix
parentc83e697aa0c3a1e3125db703f97e1048b92d0be1 (diff)
downloadnixpkgs-723f7f8f4fc44f0621227e1feaf61901fca12db9.tar
nixpkgs-723f7f8f4fc44f0621227e1feaf61901fca12db9.tar.gz
nixpkgs-723f7f8f4fc44f0621227e1feaf61901fca12db9.tar.bz2
nixpkgs-723f7f8f4fc44f0621227e1feaf61901fca12db9.tar.lz
nixpkgs-723f7f8f4fc44f0621227e1feaf61901fca12db9.tar.xz
nixpkgs-723f7f8f4fc44f0621227e1feaf61901fca12db9.tar.zst
nixpkgs-723f7f8f4fc44f0621227e1feaf61901fca12db9.zip
gobject-introspection: Don't hardcode /nix/store
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>
Diffstat (limited to 'pkgs/development/libraries/gobject-introspection/default.nix')
-rw-r--r--pkgs/development/libraries/gobject-introspection/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index c2f60d460d7..2567975aa66 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -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