diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-03 23:12:12 +0200 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2015-04-03 23:12:12 +0200 |
| commit | 6de931a0f898bc132d73a67059326b6886cc84b1 (patch) | |
| tree | a494d3f90da826fa983bfbd93e0ee2cff5f22ce8 /pkgs/desktops/plasma-5.2/default.nix | |
| parent | 7f1a782d91c537eb6972b8acd83e1957a65a93e4 (diff) | |
| parent | a8d0614a602fd00d2e23e0e86fc748cc51c6f696 (diff) | |
| download | nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.gz nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.bz2 nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.lz nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.xz nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.tar.zst nixlib-6de931a0f898bc132d73a67059326b6886cc84b1.zip | |
Merge rename.nix changes.
Diffstat (limited to 'pkgs/desktops/plasma-5.2/default.nix')
| -rw-r--r-- | pkgs/desktops/plasma-5.2/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 3b4aa6527355..7a7a48a4d82d 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -38,7 +38,7 @@ let { LibBlueDevil = pkgs.libbluedevil; PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; - PopplerQt5 = (pkgs.poppler.override { inherit qt5; }).poppler_qt5; + PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; }; } // # packages from nixpkgs (with pkgs; @@ -132,6 +132,10 @@ let plasma-workspace = with pkgs; super.plasma-workspace // { buildInputs = with xlibs; super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ]; + postPatch = '' + substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ + --replace kdostartupconfig5 $out/bin/kdostartupconfig5 + ''; postInstall = '' # We use a custom startkde script rm $out/bin/startkde |