public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rambox, franz: cleanup (#25020)

Browse Source
This commit is contained in:
gnidorah 2017-04-23 21:10:35 +03:00 committed by zimbatm
parent 4700da04ca
commit 749d495cb3
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/networking/instant-messengers/franz/default.nix
View File

@ -25,15 +25,18 @@ in stdenv.mkDerivation rec {
"16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy";
}; };
phases = [ "unpackPhase" "installPhase" "postFixup" ]; # don't remove runtime deps
dontPatchELF = true;
deps = with xorg; [ deps = (with xorg; [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver
libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib ]) ++ [
cups expat stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
udev libnotify # runtime deps
] ++ [
udev libnotify
]; ];
unpackPhase = '' unpackPhase = ''
@ -42,19 +45,20 @@ in stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz
patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz
mkdir -p $out/bin $out/share/franz mkdir -p $out/bin $out/opt/franz
cp -r * $out/share/franz cp -r * $out/opt/franz
ln -s $out/share/franz/Franz $out/bin ln -s $out/opt/franz/Franz $out/bin
# provide desktop item and icon
mkdir -p $out/share/applications $out/share/pixmaps mkdir -p $out/share/applications $out/share/pixmaps
ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications
ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps
''; '';
postFixup = '' postFixup = ''
paxmark m $out/share/franz/Franz paxmark m $out/opt/franz/Franz
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

31
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -12,7 +12,6 @@ let
url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b"; sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b";
}; };
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
name = "Rambox"; name = "Rambox";
exec = "rambox"; exec = "rambox";
@ -30,31 +29,35 @@ in stdenv.mkDerivation rec {
"13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085"; "13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085";
}; };
phases = [ "unpackPhase" "installPhase" "postFixup" ]; # don't remove runtime deps
dontPatchELF = true;
deps = with xorg; [ deps = (with xorg; [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver
libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib ]) ++ [
cups expat stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
udev libnotify # runtime deps
] ++ [
udev libnotify
]; ];
installPhase = '' installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" rambox patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox
mkdir -p $out/bin $out/share/rambox mkdir -p $out/bin $out/opt/rambox
cp -r * $out/share/rambox cp -r * $out/opt/rambox
ln -s $out/share/rambox/rambox $out/bin ln -s $out/opt/rambox/rambox $out/bin
# provide desktop item
mkdir -p $out/share/applications mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications
''; '';
postFixup = '' postFixup = ''
paxmark m $out/share/rambox/rambox paxmark m $out/opt/rambox/rambox
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {