JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

librest: rename from gnome3.rest

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-25 17:45:11 +01:00
parent 3ca8d0f814
commit 0f0179c2fa
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/gnome-3/default.nix
View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -47,6 +47,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gtkmm = gtkmm3; gtkmm = gtkmm3;
vala = pkgs.vala_0_42; vala = pkgs.vala_0_42;
gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; }; gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; };
rest = librest;
# Simplify the nixos module and gnome packages # Simplify the nixos module and gnome packages
defaultIconTheme = adwaita-icon-theme; defaultIconTheme = adwaita-icon-theme;
@ -198,8 +199,6 @@ lib.makeScope pkgs.newScope (self: with self; {
withGnome = true; withGnome = true;
}; };
rest = callPackage ./core/rest { };
rygel = callPackage ./core/rygel { }; rygel = callPackage ./core/rygel { };
simple-scan = callPackage ./core/simple-scan { }; simple-scan = callPackage ./core/simple-scan { };

13
pkgs/desktops/gnome-3/core/rest/default.nix → pkgs/development/libraries/librest/default.nix
View File

@ -1,29 +1,28 @@
{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }: { stdenv, fetchurl, pkgconfig, glib, libsoup, gobject-introspection, gnome3 }:
let stdenv.mkDerivation rec {
pname = "rest"; pname = "rest";
version = "0.8.1"; version = "0.8.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig gobject-introspection ];
buildInputs = [ glib libsoup gobject-introspection]; buildInputs = [ glib libsoup ];
configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.${pname}"; attrPath = "librest";
}; };
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Helper library for RESTful services";
homepage = https://wiki.gnome.org/Projects/Librest; homepage = https://wiki.gnome.org/Projects/Librest;
license = licenses.lgpl21; license = licenses.lgpl21;
platforms = platforms.linux; platforms = platforms.linux;

2
pkgs/top-level/all-packages.nix
View File

@ -4003,6 +4003,8 @@ in
libreswan = callPackage ../tools/networking/libreswan { }; libreswan = callPackage ../tools/networking/libreswan { };
librest = callPackage ../development/libraries/librest { };
libwebsockets = callPackage ../development/libraries/libwebsockets { }; libwebsockets = callPackage ../development/libraries/libwebsockets { };
lidarr = callPackage ../servers/lidarr { }; lidarr = callPackage ../servers/lidarr { };