alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #110890 from tu-maurice/unstable/cinnamon.xapps-2.0.6

Browse source 
cinnamon.xapps: 1.8.9 -> 2.0.6
This commit is contained in:
Sandro 2021-01-28 00:43:34 +01:00 committed by GitHub
parent 6e94aa4281 1d594486bd
commit ce15c90d66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/desktops/cinnamon/xapps/default.nix
View file

@ -1,5 +1,4 @@
{ fetchFromGitHub
, fetchpatch
, glib
, gobject-introspection
, gtk3
@ -22,22 +21,15 @@
stdenv.mkDerivation rec {
pname = "xapps";
version = "1.8.9";
version = "2.0.6";
outputs = [ "out" "dev" ];
patches = [
(fetchpatch {
url = "https://github.com/linuxmint/xapp/pull/110/commits/208563d4e2bbcfbeb4425d05f649867065c37615.patch";
sha256 = "0brqndfgawhayrm36cjh6fkff274729jivjq3h5jx93lprvl2zih";
})
];
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "01jx7612p0c0pi0r7fn5g08s6zjfmq1gfm5hi0fkzl0fxf2cx7a7";
sha256 = "11qbz547qlfsvkz4bdxhryrsf10aw5jc2f1glbik7pvmmm87gf4f";
};
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
@ -91,6 +83,10 @@ stdenv.mkDerivation rec {
# Patch pastebin & inxi location
sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info
sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info
# Patch gtk3 module target dir
substituteInPlace libxapp/meson.build \
--replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'"
'';
meta = with lib; {