diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:42:03 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:42:03 +0400 |
| commit | 31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca (patch) | |
| tree | b8f224947d534c02f69229bee8af3e63f840f7b5 /pkgs/top-level/all-packages.nix | |
| parent | 7cf8daa2bbf7e9ac1b57305a22547271dca28a6e (diff) | |
| parent | ef9175c5fb5ae0dc17bdfdffef8859d725f318c1 (diff) | |
| download | nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.gz nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.bz2 nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.lz nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.xz nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.tar.zst nixpkgs-31d76ae1b1f8c3ef71e84dd002f0c9396edfa6ca.zip | |
Merge pull request #14871 from abbradar/choice-cdrtools-cdrkit
CD/DVD writing improvements
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4de0702e2b..f332a833a37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -609,7 +609,9 @@ in boxfs = callPackage ../tools/filesystems/boxfs { }; - brasero = callPackage ../tools/cd-dvd/brasero { }; + brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); + + brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; brltty = callPackage ../tools/misc/brltty { alsaSupport = (!stdenv.isDarwin); @@ -7346,6 +7348,8 @@ in libbson = callPackage ../development/libraries/libbson { }; + libburn = callPackage ../development/libraries/libburn { }; + libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; @@ -7741,6 +7745,8 @@ in graphviz = graphviz-nox; }; + libisofs = callPackage ../development/libraries/libisofs { }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; @@ -15303,9 +15309,9 @@ in eventlist = callPackage ../applications/office/eventlist {}; - k3b = callPackage ../applications/misc/k3b { - cdrtools = cdrkit; - }; + k3b-original = lowPrio (callPackage ../applications/misc/k3b { }); + + k3b = callPackage ../applications/misc/k3b/wrapper.nix { }; kadu = callPackage ../applications/networking/instant-messengers/kadu { }; |