diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-28 19:37:36 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-28 19:37:36 +0200 |
| commit | 55357de67a2acfb11ba1a3633454c20acc9b54e7 (patch) | |
| tree | c0fe0519426690b8989818f2adb49d877284b0e8 /pkgs/top-level | |
| parent | ec59e3b3f52003a90a977f539366de59d4067c06 (diff) | |
| parent | cb1742e76d8a7254a5ffffbf86b2281b89984e2d (diff) | |
| download | nixlib-55357de67a2acfb11ba1a3633454c20acc9b54e7.tar nixlib-55357de67a2acfb11ba1a3633454c20acc9b54e7.tar.gz nixlib-55357de67a2acfb11ba1a3633454c20acc9b54e7.tar.bz2 nixlib-55357de67a2acfb11ba1a3633454c20acc9b54e7.tar.lz nixlib-55357de67a2acfb11ba1a3633454c20acc9b54e7.tar.xz nixlib-55357de67a2acfb11ba1a3633454c20acc9b54e7.tar.zst nixlib-55357de67a2acfb11ba1a3633454c20acc9b54e7.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7daec9b18678..b9bab9b947ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -347,6 +347,8 @@ with pkgs; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; + useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; iconConvTools = callPackage ../build-support/icon-conv-tools {}; |