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/applications/misc/gammu/bashcomp-dir.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/applications/misc/gammu/bashcomp-dir.patch')
| -rw-r--r-- | pkgs/applications/misc/gammu/bashcomp-dir.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/applications/misc/gammu/bashcomp-dir.patch new file mode 100644 index 000000000000..94cc2929c1ee --- /dev/null +++ b/pkgs/applications/misc/gammu/bashcomp-dir.patch @@ -0,0 +1,12 @@ +diff -Naur gammu-1.33.0.orig/contrib/CMakeLists.txt gammu-1.33.0/contrib/CMakeLists.txt +--- gammu-1.33.0.orig/contrib/CMakeLists.txt 2013-12-26 20:56:22.887772110 +0100 ++++ gammu-1.33.0/contrib/CMakeLists.txt 2013-12-26 20:57:04.386276037 +0100 +@@ -85,7 +85,7 @@ + if (INSTALL_BASH_COMPLETION) + install ( + FILES bash-completion/gammu +- DESTINATION "/etc/bash_completion.d" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" + COMPONENT "bash" + ) + endif (INSTALL_BASH_COMPLETION) |