diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/applications/misc/redis-desktop-manager | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/redis-desktop-manager')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix b/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix index 844fd19e22cc..8c4fa2efb227 100644 --- a/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 -, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols +{ mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 +, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2 , qtsvg, qttools, qtquick1, qtcharts , qmake }: @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "redis-desktop-manager"; version = "0.9.1"; @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats - qtquick1 qtquickcontrols qtsvg qttools qtcharts + qtquick1 qtquickcontrols2 qtsvg qttools qtcharts ]; dontUseQmakeConfigure = true; + dontWrapQtApps = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ]; @@ -76,7 +77,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; homepage = "https://redisdesktop.com/"; - license = licenses.lgpl21; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; }; |