commit 30891166be9156c65a50c52cd08f3c7a0f5492da · pyrox.dev/nixpkgs

+18 -14

pkgs/applications/networking/browsers/google-chrome/default.nix

···

       35
       35
        
       }).getChannel channel;

     

       36
       36
        
       

     

       37
       37
        
       let

     

       38
       38
       -
         dist = if channel == "dev" then "unstable" else channel;

     

       39
       39
       -
       

     

       40
       38
        
         opusWithCustomModes = libopus.override {

     

       41
       39
        
           withCustomModes = true;

     

       42
       40
        
         };

     
···

       71
       69
        
         '';

     

       72
       70
        
       

     

       73
       71
        
         installPhase = ''

     

       74
       74
       -
           exe=$out/bin/google-chrome-${dist}

     

       72
       72
       +
           case ${channel} in

     

       73
       73
       +
             beta) appname=chrome-beta      dist=beta     ;;

     

       74
       74
       +
             dev)  appname=chrome-unstable  dist=unstable ;;

     

       75
       75
       +
             *)    appname=chrome           dist=stable   ;;

     

       76
       76
       +
           esac

     

       77
       77
       +
       

     

       78
       78
       +
           exe=$out/bin/google-chrome-$dist

     

       75
       79
        
           rpath="${env}/lib:${env}/lib64"

     

       76
       80
        
       

     

       77
       81
        
           mkdir -p $out/bin $out/share

     
···

       79
       83
        
           cp -a opt/* $out/share

     

       80
       84
        
           cp -a usr/share/* $out/share

     

       81
       85
        
       

     

       82
       82
       -
           substituteInPlace $out/share/applications/google-chrome.desktop \

     

       83
       83
       -
             --replace /usr/bin/google-chrome-${dist} $exe

     

       84
       84
       -
           substituteInPlace $out/share/gnome-control-center/default-apps/google-chrome.xml \

     

       85
       85
       -
             --replace /opt/google/chrome/google-chrome $exe

     

       86
       86
       -
           substituteInPlace $out/share/menu/google-chrome.menu \

     

       86
       86
       +
           substituteInPlace $out/share/applications/google-$appname.desktop \

     

       87
       87
       +
             --replace /usr/bin/google-chrome-$dist $exe

     

       88
       88
       +
           substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \

     

       89
       89
       +
             --replace /opt/google/$appname/google-$appname $exe

     

       90
       90
       +
           substituteInPlace $out/share/menu/google-$appname.menu \

     

       87
       91
        
             --replace /opt $out/share \

     

       88
       88
       -
             --replace $out/share/google/chrome/google-chrome $exe

     

       92
       92
       +
             --replace $out/share/google/chrome/google-$appname $exe

     

       89
       93
        
       

     

       90
       90
       -
           for icon_file in $out/share/google/chrome/product_logo_*[0-9].png; do

     

       94
       94
       +
           for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do

     

       91
       95
        
             num_and_suffix="''${icon_file##*logo_}"

     

       92
       96
        
             icon_size="''${num_and_suffix%.*}"

     

       93
       97
        
             logo_output_prefix="$out/share/icons/hicolor"

     

       94
       98
        
             logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"

     

       95
       99
        
             mkdir -p "$logo_output_path"

     

       96
       96
       -
             mv "$icon_file" "$logo_output_path/google-chrome.png"

     

       100
       100
       +
             mv "$icon_file" "$logo_output_path/google-$appname.png"

     

       97
       101
        
           done

     

       98
       102
        
       

     

       99
       103
        
           cat > $exe << EOF

     

       100
       104
        
           #!${bash}/bin/sh

     

       101
       105
        
           export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}

     

       102
       106
        
           export PATH=${env}/bin\''${PATH:+:\$PATH}

     

       103
       103
       -
           $out/share/google/chrome/google-chrome "\$@"

     

       107
       107
       +
           $out/share/google/$appname/google-$appname "\$@"

     

       104
       108
        
           EOF

     

       105
       109
        
           chmod +x $exe

     

       106
       110
        
       

     

       107
       107
       -
           for elf in $out/share/google/chrome/{chrome,chrome-sandbox,nacl_helper}; do

     

       111
       111
       +
           for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do

     

       108
       112
        
             patchelf --set-rpath $rpath $elf

     

       109
       113
        
             patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf

     

       110
       114
        
           done

     
···

       112
       116
        
       

     

       113
       117
        
         meta = {

     

       114
       118
        
           description = "A freeware web browser developed by Google";

     

       115
       115
       -
           homepage = "https://www.google.com/chrome/browser/";

     

       119
       119
       +
           homepage = https://www.google.com/chrome/browser/;

     

       116
       120
        
           license = licenses.unfree;

     

       117
       121
        
           maintainers = [ maintainers.msteen ];

     

       118
       122
        
           platforms = platforms.linux;

pkgs/top-level/all-packages.nix

···

       12390
       12390
        
       

     

       12391
       12391
        
         google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; };

     

       12392
       12392
        
       

     

       12393
       12393
       +
         google-chrome-beta = google-chrome.override { channel = "beta"; };

     

       12394
       12394
       +
       

     

       12395
       12395
       +
         google-chrome-dev = google-chrome.override { channel = "dev"; };

     

       12396
       12396
       +
       

     

       12393
       12397
        
         googleearth = callPackage_i686 ../applications/misc/googleearth { };

     

       12394
       12398
        
       

     

       12395
       12399
        
         google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {