pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #131748 from musfay/libcprime-fix

authored by

Sandro and committed by
GitHub 2323c6e1 be071b1c

+31
unified split
+29
pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch
··· 1 + From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001 2 + From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com> 3 + Date: Wed, 28 Jul 2021 02:26:39 +0300 4 + Subject: [PATCH] fix application dirs 5 + 6 + --- 7 + cprime/systemxdg.cpp | 6 ++++-- 8 + 1 file changed, 4 insertions(+), 2 deletions(-) 9 + 10 + diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp 11 + index f9eee66..ea0553d 100644 12 + --- a/cprime/systemxdg.cpp 13 + +++ b/cprime/systemxdg.cpp 14 + @@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety 15 + SystemXdgMime::SystemXdgMime() { 16 + 17 + appsDirs << QDir::home().filePath( ".local/share/applications/" ); 18 + - appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; 19 + - appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; 20 + + appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" ); 21 + + appsDirs << "/run/current-system/sw/share/applications/"; 22 + + appsDirs << "/run/current-system/sw/share/applications/kde4/"; 23 + + appsDirs << "/run/current-system/sw/share/gnome/applications/"; 24 + }; 25 + 26 + DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) { 27 + -- 28 + 2.32.0 29 +
+2
pkgs/development/libraries/libcprime/default.nix
··· 19 19 sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; 20 20 }; 21 21 22 + patches = [ ./0001-fix-application-dirs.patch ]; 23 + 22 24 nativeBuildInputs = [ 23 25 cmake 24 26 ninja