ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

* libiodbc: don't pass all of Nixpkgs to the package. There is no

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2010-04-06 10:50:52 +00:00
parent 5330be5fbb
commit 2aac41a8db
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libiodbc/default.nix
View File

@ -1,9 +1,4 @@
a: { stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }:
let
inherit (a) stdenv fetchurl pkgconfig cg;
inherit (a.gtkLibs) gtk;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libiodbc-3.52.7"; name = "libiodbc-3.52.7";
@ -13,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7"; sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7";
}; };
buildInputs = if cg "gtk" false then [ gtk pkgconfig ] else []; buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ];
meta = { meta = {
description = "iODBC driver manager"; description = "iODBC driver manager";

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

@ -4280,8 +4280,11 @@ let
inherit stdenv fetchurl perl; inherit stdenv fetchurl perl;
}; };
libiodbc = makeOverridable (import ../development/libraries/libiodbc) libiodbc = makeOverridable (import ../development/libraries/libiodbc) {
(pkgs // { cg = getPkgConfig "libiodbc"; }); inherit stdenv fetchurl pkgconfig;
inherit (gtkLibs) gtk;
useGTK = getPkgConfig "libiodbc" "gtk" false;
};
libnice = import ../development/libraries/libnice { libnice = import ../development/libraries/libnice {
inherit stdenv fetchurl pkgconfig; inherit stdenv fetchurl pkgconfig;