sawfish: refactor

Now with strictDeps and gtk-x11!

+13 -12
+13 -12
pkgs/applications/window-managers/sawfish/default.nix
··· 4 4 , autoreconfHook 5 5 , gdk-pixbuf-xlib 6 6 , gettext 7 - , gtk2 7 + , gtk2-x11 8 8 , libICE 9 9 , libSM 10 10 , libxcrypt ··· 20 20 , which 21 21 }: 22 22 23 - stdenv.mkDerivation rec { 23 + stdenv.mkDerivation (finalAttrs: { 24 24 pname = "sawfish"; 25 25 version = "1.13.0"; 26 26 27 27 src = fetchurl { 28 - url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz"; 29 - sha256 = "sha256-gWs8W/pMtQjbH8FEifzNAj3siZzxPd6xm8PmXXhyr10="; 28 + url = "https://download.tuxfamily.org/sawfish/sawfish_${finalAttrs.version}.tar.xz"; 29 + hash = "sha256-gWs8W/pMtQjbH8FEifzNAj3siZzxPd6xm8PmXXhyr10="; 30 30 }; 31 31 32 32 nativeBuildInputs = [ ··· 38 38 texinfo 39 39 which 40 40 ]; 41 + 41 42 buildInputs = [ 42 43 gdk-pixbuf-xlib 43 - gtk2 44 + gtk2-x11 44 45 libICE 45 46 libSM 46 47 libxcrypt ··· 60 61 strictDeps = true; 61 62 62 63 postInstall = '' 63 - for i in $out/lib/sawfish/sawfish-menu \ 64 + for file in $out/lib/sawfish/sawfish-menu \ 64 65 $out/bin/sawfish-about \ 65 66 $out/bin/sawfish-client \ 66 67 $out/bin/sawfish-config \ 67 68 $out/bin/sawfish; do 68 - wrapProgram $i \ 69 + wrapProgram $file \ 69 70 --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ 70 71 --set REP_LOAD_PATH "$out/share/sawfish/lisp" 71 72 done 72 73 ''; 73 74 74 - meta = with lib; { 75 + meta = { 75 76 homepage = "http://sawfish.tuxfamily.org/"; 76 77 description = "An extensible, Lisp-based window manager"; 77 78 longDescription = '' ··· 81 82 possible. All high-level WM functions are implemented in Lisp for future 82 83 extensibility or redefinition. 83 84 ''; 84 - license = licenses.gpl2Plus; 85 - maintainers = with maintainers; [ AndersonTorres ]; 86 - platforms = platforms.unix; 85 + license = lib.licenses.gpl2Plus; 86 + maintainers = with lib.maintainers; [ AndersonTorres ]; 87 + platforms = lib.platforms.unix; 87 88 }; 88 - } 89 + })