summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2021-08-02 17:56:18 -0300
committerGitHub <noreply@github.com>2021-08-02 17:56:18 -0300
commitb23da892671c2c155aa7a5fdd6c6af407eea1799 (patch)
tree849ebc16c4c079c462e68e4d42c2a1730da98c8c
parent5c7a7dd54104b6b8c9255ca2f524f82e08672d02 (diff)
parenta1479b3998fd641be47736475312683c4b35c2dd (diff)
downloadnixpkgs-b23da892671c2c155aa7a5fdd6c6af407eea1799.tar
nixpkgs-b23da892671c2c155aa7a5fdd6c6af407eea1799.tar.gz
nixpkgs-b23da892671c2c155aa7a5fdd6c6af407eea1799.tar.bz2
nixpkgs-b23da892671c2c155aa7a5fdd6c6af407eea1799.tar.lz
nixpkgs-b23da892671c2c155aa7a5fdd6c6af407eea1799.tar.xz
nixpkgs-b23da892671c2c155aa7a5fdd6c6af407eea1799.tar.zst
nixpkgs-b23da892671c2c155aa7a5fdd6c6af407eea1799.zip
Merge pull request #132444 from AndersonTorres/new-icewm
icewm: 2.3.4 -> 2.6.0
-rw-r--r--pkgs/applications/window-managers/icewm/default.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 77ed0c561cd..1584b7fed01 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,9 +1,8 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, cmake
-, pkg-config
 , asciidoc
+, cmake
 , expat
 , fontconfig
 , freetype
@@ -11,6 +10,7 @@
 , gdk-pixbuf
 , gdk-pixbuf-xlib
 , gettext
+, giflib
 , glib
 , imlib2
 , libICE
@@ -30,22 +30,22 @@
 , libpthreadstubs
 , libsndfile
 , libtiff
-, giflib
 , libxcb
 , mkfontdir
 , pcre
 , perl
+, pkg-config
 }:
 
 stdenv.mkDerivation rec {
   pname = "icewm";
-  version = "2.3.4";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner  = "ice-wm";
     repo = pname;
     rev = version;
-    hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A=";
+    hash = "sha256-R06tiWS9z6K5Nbi+vvk7DyozpcFdrHleMeh7Iq/FfHQ=";
   };
 
   nativeBuildInputs = [
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     gdk-pixbuf-xlib
     gettext
+    giflib
     glib
     imlib2
     libICE
@@ -81,13 +82,15 @@ stdenv.mkDerivation rec {
     libpthreadstubs
     libsndfile
     libtiff
-    giflib
     libxcb
     mkfontdir
     pcre
   ];
 
-  cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ];
+  cmakeFlags = [
+    "-DPREFIX=$out"
+    "-DCFGDIR=/etc/icewm"
+  ];
 
   # install legacy themes
   postInstall = ''