diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/spice | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/spice')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/spice/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/spice/default.nix b/nixpkgs/pkgs/development/libraries/spice/default.nix index 33677303ddcb..ee0f6be16984 100644 --- a/nixpkgs/pkgs/development/libraries/spice/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice/default.nix @@ -24,6 +24,16 @@ , orc }: +let + # This file was mistakenly not included with the 0.15.0 release tarball. + # Should be fixed with the next release. + # https://gitlab.freedesktop.org/spice/spice/-/issues/56 + doxygen_sh = fetchurl { + url = "https://gitlab.freedesktop.org/spice/spice/-/raw/v0.15.0/doxygen.sh"; + sha256 = "0g4bx91qclihp1jfhdhyj7wp4hf4289794xxbw32kk58lnd7bzkg"; + }; +in + stdenv.mkDerivation rec { pname = "spice"; version = "0.15.0"; @@ -34,15 +44,15 @@ stdenv.mkDerivation rec { }; postPatch = '' + install ${doxygen_sh} doxygen.sh patchShebangs build-aux ''; - nativeBuildInputs = [ + glib meson ninja pkg-config - spice-protocol python3 python3.pkgs.six python3.pkgs.pyparsing @@ -66,6 +76,7 @@ stdenv.mkDerivation rec { orc pixman python3.pkgs.pyparsing + spice-protocol zlib ]; @@ -73,7 +84,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgstreamer=1.0" - "-Dcelt051=disabled" ]; postInstall = '' |