diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index 3d2238b57788..08214c30a887 100644 --- a/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch +++ b/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -15,13 +15,13 @@ index 4c40d4c..5dbb6ff 100644 SystemXdgMime::SystemXdgMime() { -- appsDirs << QDir::home().filePath(".local/share/applications/"); -- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; -- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; -+ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); -+ appsDirs << "/run/current-system/sw/share/applications/"; -+ appsDirs << "/run/current-system/sw/share/applications/kde4/"; -+ appsDirs << "/run/current-system/sw/share/gnome/applications/"; +- appsDirs << QDir::home().filePath(".local/share/applications/"); +- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/"); +- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/"); ++ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; } |