diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-04-06 10:50:52 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-04-06 10:50:52 +0000 |
commit | 2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b (patch) | |
tree | a8e88056b8ffb43cc368a503f765c153fc392b8a | |
parent | 5330be5fbb7cac454cb443a3fed7012258d556bc (diff) | |
download | nixlib-2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b.tar nixlib-2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b.tar.gz nixlib-2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b.tar.bz2 nixlib-2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b.tar.lz nixlib-2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b.tar.xz nixlib-2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b.tar.zst nixlib-2aac41a8dbc4dd1385cc3cf0db22ea1f9702546b.zip |
* libiodbc: don't pass all of Nixpkgs to the package. There is no
reason why this shouldn't work, but it breaks NixOS evaluation on x86_64-linux with weird segfaults and assertion failures, probably due to a bug in the evaluator or the ATerm library. svn path=/nixpkgs/trunk/; revision=20953
-rw-r--r-- | pkgs/development/libraries/libiodbc/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 2899547a215f..fb3a2fd11d00 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,9 +1,4 @@ -a: - -let - inherit (a) stdenv fetchurl pkgconfig cg; - inherit (a.gtkLibs) gtk; -in +{ stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.7"; @@ -13,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7"; }; - buildInputs = if cg "gtk" false then [ gtk pkgconfig ] else []; + buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ]; meta = { description = "iODBC driver manager"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83cfc589dbd6..7a411eceea8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4280,8 +4280,11 @@ let inherit stdenv fetchurl perl; }; - libiodbc = makeOverridable (import ../development/libraries/libiodbc) - (pkgs // { cg = getPkgConfig "libiodbc"; }); + libiodbc = makeOverridable (import ../development/libraries/libiodbc) { + inherit stdenv fetchurl pkgconfig; + inherit (gtkLibs) gtk; + useGTK = getPkgConfig "libiodbc" "gtk" false; + }; libnice = import ../development/libraries/libnice { inherit stdenv fetchurl pkgconfig; |