diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-28 00:43:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 00:43:34 +0100 |
| commit | ce15c90d669ec380d4488ea046d3fd9cd2ccc931 (patch) | |
| tree | 44688b7b0cd9ef38bd147d960bcaa9f212ac9654 | |
| parent | 6e94aa4281e403e2c5fa9e4b68f9e69b14f2bf3a (diff) | |
| parent | 1d594486bdc175909b328b2471e161c330e795e1 (diff) | |
| download | nixpkgs-ce15c90d669ec380d4488ea046d3fd9cd2ccc931.tar nixpkgs-ce15c90d669ec380d4488ea046d3fd9cd2ccc931.tar.gz nixpkgs-ce15c90d669ec380d4488ea046d3fd9cd2ccc931.tar.bz2 nixpkgs-ce15c90d669ec380d4488ea046d3fd9cd2ccc931.tar.lz nixpkgs-ce15c90d669ec380d4488ea046d3fd9cd2ccc931.tar.xz nixpkgs-ce15c90d669ec380d4488ea046d3fd9cd2ccc931.tar.zst nixpkgs-ce15c90d669ec380d4488ea046d3fd9cd2ccc931.zip | |
Merge pull request #110890 from tu-maurice/unstable/cinnamon.xapps-2.0.6
cinnamon.xapps: 1.8.9 -> 2.0.6
| -rw-r--r-- | pkgs/desktops/cinnamon/xapps/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index f9429a071cc..7be80048e3c 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -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; { |