diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/qcoro | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qcoro')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qcoro/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qcoro/default.nix b/nixpkgs/pkgs/development/libraries/qcoro/default.nix index d5d3fd8ba1bb..96cf2cd6fc8e 100644 --- a/nixpkgs/pkgs/development/libraries/qcoro/default.nix +++ b/nixpkgs/pkgs/development/libraries/qcoro/default.nix @@ -1,30 +1,34 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , libpthreadstubs , qtbase +, qtwebsockets +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.4.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-RVpyL+BklX8Wyk9Xj9UyuvNK5Vev8ZsrOSMxX1HtcHU="; + sha256 = "sha256-kf2W/WAZCpLkq1UIy7iZri4vNaqjGjotB/Xsb+byZV4="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ + wrapQtAppsHook cmake ]; buildInputs = [ qtbase + qtwebsockets libpthreadstubs ]; @@ -34,6 +38,5 @@ mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ smitop ]; platforms = platforms.linux; - badPlatforms = platforms.aarch64; }; } |