Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb28b3e80fe6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a8a6d26f8f04
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 22, 2018

  1. partition-manager: 3.0.1 -> 3.3.1 (#40895) 

    The `3.0.1` build was broken (see the Hydra build from
https://hydra.nixos.org/build/74368257 for further reference).

Because of the missing `utillinux` build input the package fails fairly
early:

```
-- Checking for module 'blkid'
--   No package 'blkid' found
CMake Error at /nix/store/9hmhxgj4jk6jmxihgavj6gm0p759misc-cmake-3.10.2/share/cmake-3.10/Modules/FindPkgConfig.cmake:415 (message):
  A required package was not found
```

Additionally `partition-manager` was broken on non-KDE desktops (none+i3
in my case) as the plugins from `libsForQt5.kpmcore` couldn't be found
in `QT_PLUGIN_PATH` unless it's installed in
`environment.systemPackages` or with `nix-env -iA libsForQt5.kpmcore`.
This has been fixed by adding a wrapper in the `postInstall` hook which
prefixes the `QT_PLUGIN_PATH` with the plugin path from `kpmcore` used
for the build.
    @Ma27 @xeji
    Ma27 authored and xeji committed May 22, 2018
    Copy the full SHA
    a8a6d26 View commit details
Showing with 18 additions and 8 deletions.
  1. +18 −8 pkgs/tools/misc/partition-manager/default.nix
26 changes: 18 additions & 8 deletions pkgs/tools/misc/partition-manager/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
{ mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools, wrapGAppsHook
, kconfig, kcrash, kinit, kpmcore
, eject, libatasmart }:
, eject, libatasmart , utillinux, makeWrapper, qtbase
}:

let
pname = "partitionmanager";
in mkDerivation rec {
name = "${pname}-${version}";
version = "3.0.1";
version = "3.3.1";

src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
sha256 = "0jhggb4xksb0k0mj752n6pz0xmccnbzlp984xydqbz3hkigra1si";
};

enableParallelBuilding = true;

nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook makeWrapper ];

# refer to kpmcore for the use of eject
buildInputs = [ eject libatasmart utillinux ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];

postInstall = ''
wrapProgram "$out/bin/partitionmanager" --prefix QT_PLUGIN_PATH : "${kpmcore}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins"
'';

meta = with lib; {
description = "KDE Partition Manager";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
homepage = https://www.kde.org/applications/system/kdepartitionmanager/;
maintainers = with maintainers; [ peterhoeg ma27 ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
# refer to kpmcore for the use of eject
buildInputs = [ eject libatasmart ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
}