diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch | |
parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch')
-rw-r--r-- | pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch new file mode 100644 index 000000000000..bb8fd185c77a --- /dev/null +++ b/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch @@ -0,0 +1,25 @@ +diff -ur qtcurve-1.8.17-a/CMakeLists.txt qtcurve-1.8.17-b/CMakeLists.txt +--- qtcurve-1.8.17-a/CMakeLists.txt 2013-10-18 07:35:20.000000000 -0500 ++++ qtcurve-1.8.17-b/CMakeLists.txt 2013-12-30 10:58:43.303808246 -0600 +@@ -135,8 +135,9 @@ + if(ENABLE_GTK2) + find_package(PkgConfig REQUIRED) + pkg_check_modules(GTK2 REQUIRED gtk+-2.0) ++ set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}") + if(GTK2_THEME_PREFIX) +- set(GTK2_PREIX "${GTK2_THEME_PREFIX}") ++ set(GTK2_PREFIX "${GTK2_THEME_PREFIX}") + elseif(NOT GTK2_PREFIX) + set(GTK2_PREFIX "${CMAKE_INSTALL_PREFIX}") + endif() +diff -ur qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt +--- qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt 2013-10-18 07:35:20.000000000 -0500 ++++ qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt 2013-12-30 11:23:41.370548328 -0600 +@@ -88,6 +88,6 @@ + m ${QTC_X11_LIBRARIES} qtcurve-utils) + + install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION +- ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines) ++ lib/gtk-2.0/${GTK2_BIN_VERSION}/engines) + install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals + DESTINATION ${GTK2_THEME_DIR}/gtk-2.0) |