diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-22 13:47:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-22 18:22:22 +0000 |
| commit | 1b9a13c4689af7e088eb7af5589f8c811282846a (patch) | |
| tree | 3ed032953008280fb94ef894c869ff3e2a2f7865 /nixpkgs/pkgs/tools/misc/gparted | |
| parent | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (diff) | |
| parent | 1412af4b2cfae71d447164097d960d426e9752c0 (diff) | |
| download | nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.gz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.bz2 nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.lz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.xz nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.tar.zst nixlib-1b9a13c4689af7e088eb7af5589f8c811282846a.zip | |
Merge remote-tracking branch 'channels/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/gparted')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/gparted/default.nix | 33 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/gparted/polkit.patch | 12 |
2 files changed, 36 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/tools/misc/gparted/default.nix b/nixpkgs/pkgs/tools/misc/gparted/default.nix index 6834a555e4d5..49a2809b6042 100644 --- a/nixpkgs/pkgs/tools/misc/gparted/default.nix +++ b/nixpkgs/pkgs/tools/misc/gparted/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme -, gpart, hdparm, procps, utillinux +{ stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 +, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2, hicolor-icon-theme +, gpart, hdparm, procps, utillinux, polkit, wrapGAppsHook, substituteAll }: stdenv.mkDerivation rec { @@ -11,16 +11,31 @@ stdenv.mkDerivation rec { sha256 = "0mdvn85jvy72ff7nds3dakx9kzknh8gx1z8i0w2sf970q03qp2z4"; }; + # Tries to run `pkexec --version` to get version. + # however the binary won't be suid so it returns + # an error preventing the program from detection + patches = [ + (substituteAll { + src = ./polkit.patch; + polkit_version = polkit.version; + }) + ]; + configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme ]; - nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 hicolor-icon-theme polkit.bin gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ intltool gettext pkgconfig wrapGAppsHook ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux procps coreutils gnused gnugrep ]}" + ) + ''; + # Doesn't get installed automaticallly if PREFIX != /usr postInstall = '' - wrapProgram $out/bin/gparted \ - --prefix PATH : "${procps}/bin" - wrapProgram $out/sbin/gpartedbin \ - --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm utillinux ]}" + install -D -m0644 org.gnome.gparted.policy \ + $out/share/polkit-1/actions/org.gnome.gparted.policy ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/gparted/polkit.patch b/nixpkgs/pkgs/tools/misc/gparted/polkit.patch new file mode 100644 index 000000000000..a42ed785de94 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/gparted/polkit.patch @@ -0,0 +1,12 @@ +diff -ru old/gparted-1.0.0/configure gparted-1.0.0/configure +--- old/gparted-1.0.0/configure 2019-05-29 12:02:13.000000000 -0400 ++++ gparted-1.0.0/configure 2019-08-08 18:09:52.792795781 -0400 +@@ -16145,7 +16145,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkexec >= $PKEXEC_REQUIRED_VERSION" >&5 + $as_echo_n "checking for pkexec >= $PKEXEC_REQUIRED_VERSION... " >&6; } + PKEXEC_REQUIRED_INT=`echo "$PKEXEC_REQUIRED_VERSION" | $AWK -F. '{print $1 * 10000 + $2}'` +-PKEXEC_VERSION_OUTPUT=`pkexec --version 2> /dev/null` || ++PKEXEC_VERSION_OUTPUT='pkexec version @polkit_version@' || + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } + if test "x$PKEXEC_VERSION_OUTPUT" != 'x'; then |