diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/libraries/libvncserver | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvncserver')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libvncserver/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvncserver/default.nix b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix index b9890f6a806b..b9da7135f92e 100644 --- a/nixpkgs/pkgs/development/libraries/libvncserver/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvncserver/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { pname = "libvncserver"; version = "0.9.13"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "LibVNC"; repo = "libvncserver"; @@ -23,11 +25,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-gQT/M2u4nWQ0MfO2gWAqY0ZJc7V9eGczGzcsxKmG4H8="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg openssl libgcrypt libpng ] - ++ lib.optional stdenv.isLinux systemd - ++ lib.optional stdenv.isDarwin Carbon; - propagatedBuildInputs = [ zlib ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libjpeg + openssl + libgcrypt + libpng + ] ++ lib.optionals stdenv.isLinux [ + systemd + ] ++ lib.optional stdenv.isDarwin [ + Carbon + ]; + + propagatedBuildInputs = [ + zlib + ]; meta = with lib; { description = "VNC server library"; |