From 5e5df0fea29323a1a75b8a16911e22955525ed82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 18 Dec 2016 22:16:48 +0100 Subject: [PATCH] rocksdb-haskell: just compile rocksdb statically to fix #21215 --- pkgs/development/haskell-modules/hackage-packages.nix | 2 +- pkgs/development/libraries/rocksdb/default.nix | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 840c45d3d019..6a3492ef97ec 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -148676,7 +148676,7 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index a8f8ab31d1c2..9a481c0b20f1 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -36,13 +36,10 @@ stdenv.mkDerivation rec { JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; buildFlags = [ - "shared_lib" "static_lib" ]; installFlags = [ - "install-shared" - "install-static" "INSTALL_PATH=\${out}" ];