diff options
author | Robin Gloster <mail@glob.in> | 2019-07-30 03:41:32 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2019-07-30 03:41:32 +0200 |
commit | 242e52dbb10db220aaa1d157720914864bbf685f (patch) | |
tree | 7dafc4a947f0760d6083906a9212d1786adf98a5 /pkgs/applications/networking/nextcloud-client | |
parent | fafcf50a5679dede3101808a82f07ed0bedb0074 (diff) |
treewide: remove openssl 1.1 pinning
Diffstat (limited to 'pkgs/applications/networking/nextcloud-client')
-rw-r--r-- | pkgs/applications/networking/nextcloud-client/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 37eb248fb486b..b9015e7a9e3af 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, wrapQtAppsHook, openssl_1_1, pcre, qtwebengine, libsecret +, inotify-tools, wrapQtAppsHook, openssl, pcre, qtwebengine, libsecret , libcloudproviders }: @@ -16,17 +16,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; + buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl.out pcre inotify-tools libcloudproviders ]; enableParallelBuilding = true; - NIX_LDFLAGS = "${openssl_1_1.out}/lib/libssl.so ${openssl_1_1.out}/lib/libcrypto.so"; + NIX_LDFLAGS = "${openssl.out}/lib/libssl.so ${openssl.out}/lib/libcrypto.so"; cmakeFlags = [ "-UCMAKE_INSTALL_LIBDIR" "-DCMAKE_BUILD_TYPE=Release" - "-DOPENSSL_LIBRARIES=${openssl_1_1.out}/lib" - "-DOPENSSL_INCLUDE_DIR=${openssl_1_1.dev}/include" + "-DOPENSSL_LIBRARIES=${openssl.out}/lib" + "-DOPENSSL_INCLUDE_DIR=${openssl.dev}/include" "-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so" "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; |