diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 19:52:39 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-23 13:18:36 +0100 |
commit | 556474aad99c16417accf014fe6caeb7af96c439 (patch) | |
tree | 6df8d1b39c94d0914c7bd98bff1d7af698e8dab3 /pkgs/desktops | |
parent | cb23f4dbeef25b5205511772984a3e74fffe053e (diff) | |
download | nixlib-556474aad99c16417accf014fe6caeb7af96c439.tar nixlib-556474aad99c16417accf014fe6caeb7af96c439.tar.gz nixlib-556474aad99c16417accf014fe6caeb7af96c439.tar.bz2 nixlib-556474aad99c16417accf014fe6caeb7af96c439.tar.lz nixlib-556474aad99c16417accf014fe6caeb7af96c439.tar.xz nixlib-556474aad99c16417accf014fe6caeb7af96c439.tar.zst nixlib-556474aad99c16417accf014fe6caeb7af96c439.zip |
gnome3.seahorse: clean up
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/apps/seahorse/default.nix | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 1a8c2f55b1b0..60e8822135ce 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -4,37 +4,36 @@ , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11-kit, openssh }: -stdenv.mkDerivation rec { - name = "seahorse-${version}"; +let + pname = "seahorse"; version = "3.20.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; }; - }; - doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg - gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11-kit vala - openssh ]; + nativeBuildInputs = [ pkgconfig vala intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gnome3.gcr + gnome3.gsettings-desktop-schemas gnupg + gnome3.defaultIconTheme gpgme + libsecret avahi libsoup p11-kit + openssh + ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Seahorse; |