From 723f7f8f4fc44f0621227e1feaf61901fca12db9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 Jan 2016 23:55:31 +0100 Subject: [PATCH] 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 --- pkgs/development/libraries/gobject-introspection/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index c2f60d460d7e..2567975aa660 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b04d2c1457bc..8d270ce7f860 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };