diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-10-31 10:10:43 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-10-31 11:02:13 +0100 |
| commit | a5d70a83eb38e87dba9387164f86fc5e5812203c (patch) | |
| tree | b9450e6292127fa20965a6dcbe7a107b1dee2287 /pkgs/applications/misc/gnome-recipes | |
| parent | a20a4af62aee6f338f81cd16e988bea3878adf59 (diff) | |
| download | nixpkgs-a5d70a83eb38e87dba9387164f86fc5e5812203c.tar nixpkgs-a5d70a83eb38e87dba9387164f86fc5e5812203c.tar.gz nixpkgs-a5d70a83eb38e87dba9387164f86fc5e5812203c.tar.bz2 nixpkgs-a5d70a83eb38e87dba9387164f86fc5e5812203c.tar.lz nixpkgs-a5d70a83eb38e87dba9387164f86fc5e5812203c.tar.xz nixpkgs-a5d70a83eb38e87dba9387164f86fc5e5812203c.tar.zst nixpkgs-a5d70a83eb38e87dba9387164f86fc5e5812203c.zip | |
gnome-recipes: 2.0.2 → 2.0.4
https://gitlab.gnome.org/GNOME/recipes/-/compare/2.0.2...2.0.4
Diffstat (limited to 'pkgs/applications/misc/gnome-recipes')
| -rw-r--r-- | pkgs/applications/misc/gnome-recipes/default.nix | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index b35319c3863..04526ec3465 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv -, fetchurl +{ stdenv +, lib +, fetchFromGitLab , meson , ninja , pkg-config -, gnome , desktop-file-utils , gettext , itstool @@ -17,17 +17,21 @@ , json-glib , gnome-autoar , gspell -, libcanberra }: +, libcanberra +, nix-update-script +}: -let +stdenv.mkDerivation rec { pname = "gnome-recipes"; - version = "2.0.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "2.0.4"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "recipes"; + rev = version; + fetchSubmodules = true; + sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw="; }; nativeBuildInputs = [ @@ -53,10 +57,6 @@ in stdenv.mkDerivation rec { libcanberra ]; - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/GNOME/recipes/issues/76 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - postPatch = '' chmod +x src/list_to_c.py patchShebangs src/list_to_c.py @@ -64,8 +64,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { + attrPath = pname; }; }; @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { description = "Recipe management application for GNOME"; homepage = "https://wiki.gnome.org/Apps/Recipes"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; }; } |