From 5f57d2dc506d27da999756666466f81eef6e3c98 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Sat, 19 Sep 2015 22:03:11 -0400 Subject: [PATCH 1/2] maintainers: add a maintainer to the set --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f4cbd25da809..d8a5adf5f98c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -166,6 +166,7 @@ joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; jpbernardy = "Jean-Philippe Bernardy "; + jraygauthier = "Raymond Gauthier "; jwiegley = "John Wiegley "; jwilberding = "Jordan Wilberding "; jzellner = "Jeff Zellner "; From 4f347ca8fe5cb120cab2916e14770e3e3416a6e5 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Sat, 19 Sep 2015 22:04:16 -0400 Subject: [PATCH 2/2] keepass: improvements `*.desktop` file now: - Refers to an icon. - Is placed in the proper category (based on comparison with `keepassx2`. - Has proper mime type (also based on comparison). Also, now use `icoutils` to extract icons from the application ressouces and transform them from `*.ico` to `*.png`. Created and used a generic script that has the ability to move the extracted `*.png` to their appropriate standard freedesktop location. Tested this on nixos. `keepass` now has a icon and is categorized in the same bin as `keepassx2`. The program still execute and function prefectly. --- pkgs/applications/misc/keepass/default.nix | 28 +++++++-- .../extractWinRscIconsToStdFreeDesktopDir.sh | 61 +++++++++++++++++++ 2 files changed, 84 insertions(+), 5 deletions(-) create mode 100755 pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 8f16283d3911..948d03262b6b 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, plugins ? [] }: +{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, plugins ? [] }: # KeePass looks for plugins in under directory in which KeePass.exe is # located. It follows symlinks where looking for that directory, so @@ -17,7 +17,7 @@ with builtins; buildDotnetPackage rec { sourceRoot = "."; - buildInputs = [ unzip makeWrapper ]; + buildInputs = [ unzip makeWrapper icoutils ]; pluginLoadPathsPatch = let outputLc = toString (add 8 (length plugins)); @@ -52,9 +52,14 @@ with builtins; buildDotnetPackage rec { name = "keepass"; exec = "keepass"; comment = "Password manager"; + icon = "keepass"; desktopName = "Keepass"; genericName = "Password manager"; - categories = "Application;Other;"; + categories = "Application;Utility;"; + mimeType = stdenv.lib.concatStringsSep ";" [ + "application/x-keepass2" + "" + ]; }; outputFiles = [ "Build/KeePass/Release/*" "Build/KeePassLib/Release/*" ]; @@ -67,16 +72,29 @@ with builtins; buildDotnetPackage rec { # is found and does not pollute output path. binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); - postInstall = '' + postInstall = + let + extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; + in + '' mkdir -p "$out/share/applications" cp ${desktopItem}/share/applications/* $out/share/applications wrapProgram $out/bin/keepass --prefix PATH : "$binPaths" + + ${extractFDeskIcons} \ + "./Translation/TrlUtil/Resources/KeePass.ico" \ + '[^\.]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' \ + '\1' \ + '([^\.]+).+' \ + 'keepass' \ + "$out" \ + "./tmp" ''; meta = { description = "GUI password manager with strong cryptography"; homepage = http://www.keepass.info/; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz ]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh new file mode 100755 index 000000000000..04485b146a04 --- /dev/null +++ b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh @@ -0,0 +1,61 @@ +#!/bin/sh + +# The file from which to extract *.ico files. +#rscFile="./KeePass.exe" +rscFile=$1 + +# A regexp that can extract the image size from the file name. +# sizeRegex='[^\.]+\.exe_[0-9]+_[0-9]+_[0-9]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' +sizeRegex=$2 + +# sizeReplaceExp='\1' +sizeReplaceExp=$3 + +# A regexp that can extract the name of the target image from the file name. +# nameRegex='([^\.]+)\.exe.+' +nameRegex=$4 + +# nameReplaceExp='\1' +nameReplaceExp=$5 + +# out=./myOut +out=$6 + +# An optional temp dir. TODO: Generate it randomly by default instead. +tmp=./tmp +if [ "" != "$4" ]; then + tmp=$7 +fi + + + +rm -rf $tmp/png $tmp/ico +mkdir -p $tmp/png $tmp/ico + +# Extract the ressource file's extension. +rscFileExt=`echo "$rscFile" | sed -re 's/.+\.(.+)$/\1/'` + +# Debug ressource file extension. +echo "rscFileExt=$rscFileExt" + +if [ "ico" = "$rscFileExt" ]; then + cp -p $rscFile $tmp/ico +else + wrestool -x --output=$tmp/ico -t14 $rscFile +fi + +icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico + +mkdir -p $out + +for i in $tmp/png/*.png; do + fn=`basename "$i"` + size=$(echo $fn | sed -re 's/'${sizeRegex}'/'${sizeReplaceExp}'/') + name=$(echo $fn | sed -re 's/'${nameRegex}'/'${nameReplaceExp}'/') + targetDir=$out/share/icons/hicolor/$size/apps + targetFile=$targetDir/$name.png + mkdir -p $targetDir + mv $i $targetFile +done + +rm -rf $tmp/png $tmp/ico