diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/libraries/unixODBCDrivers | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/unixODBCDrivers')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index 4d4d837e2e92..7e4a8b4f6cce 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -64,14 +64,6 @@ buildInputs = [ unixODBC openssl libiconv zlib ] ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; - # TODO: remove preConfigure on staging - preConfigure = if !stdenv.isDarwin then '' - # we don't want to build a .pkg - substituteInPlace CMakeLists.txt \ - --replace "IF(APPLE)" "IF(0)" \ - --replace "CMAKE_SYSTEM_NAME MATCHES AIX" "APPLE" - '' else null; - cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" "-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib" |